diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-11 14:07:20 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-11 14:07:20 +0000 |
commit | 037ce7f6bc29b2eeb4f40f0c28376c1aca8be844 (patch) | |
tree | 0de60c0c48afe9297954143a7bf758bba76df6f3 | |
parent | 975e43b8cb8d4cdd3e4ac126db894d1053cb8a02 (diff) | |
download | ruby-037ce7f6bc29b2eeb4f40f0c28376c1aca8be844.tar.gz |
* 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
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40646 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ext/socket/rubysocket.h | 6 |
2 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Sat May 11 23:01:58 2013 NARUSE, Yui <naruse@ruby-lang.org> + + * 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@fsij.org> * test/rinda/test_rinda.rb: Socket.getifaddrs may returns an interface diff --git a/ext/socket/rubysocket.h b/ext/socket/rubysocket.h index d049d0f570..7b1d43afac 100644 --- a/ext/socket/rubysocket.h +++ b/ext/socket/rubysocket.h @@ -22,7 +22,11 @@ # 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 |