[前][次][番号順一覧][スレッド一覧]

ruby-changes:28594

From: naruse <ko1@a...>
Date: Sat, 11 May 2013 23:09:51 +0900 (JST)
Subject: [ruby-changes:28594] naruse:r40646 (trunk): * ext/socket/rubysocket.h (HAVE_TYPE_STRUCT_SOCKADDR_DL):

naruse	2013-05-11 23:07:20 +0900 (Sat, 11 May 2013)

  New Revision: 40646

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=40646

  Log:
    * ext/socket/rubysocket.h (HAVE_TYPE_STRUCT_SOCKADDR_DL):
      MSVC has struct sockadddr_dl, but its content is broken.
      http://ruby-mswin.cloudapp.net/vc10-x64/ruby-trunk/log/20130511T103938Z.log.html.gz

  Modified files:
    trunk/ChangeLog
    trunk/ext/socket/rubysocket.h

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 40645)
+++ ChangeLog	(revision 40646)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sat May 11 23:01:58 2013  NARUSE, Yui  <naruse@r...>
+
+	* ext/socket/rubysocket.h (HAVE_TYPE_STRUCT_SOCKADDR_DL):
+	  MSVC has struct sockadddr_dl, but its content is broken.
+	  http://ruby-mswin.cloudapp.net/vc10-x64/ruby-trunk/log/20130511T103938Z.log.html.gz
+
 Sat May 11 22:07:42 2013  Tanaka Akira  <akr@f...>
 
 	* test/rinda/test_rinda.rb: Socket.getifaddrs may returns an interface
Index: ext/socket/rubysocket.h
===================================================================
--- ext/socket/rubysocket.h	(revision 40645)
+++ ext/socket/rubysocket.h	(revision 40646)
@@ -22,7 +22,11 @@ https://github.com/ruby/ruby/blob/trunk/ext/socket/rubysocket.h#L22
 #  include <xti.h>
 #endif
 
-#ifndef _WIN32
+#ifdef _WIN32
+#  if defined(_MSC_VER)
+#    undef HAVE_TYPE_STRUCT_SOCKADDR_DL
+#  endif
+#else
 #  if defined(__BEOS__) && !defined(__HAIKU__) && !defined(BONE)
 #    include <net/socket.h>
 #  else

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]