diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-02-06 17:03:35 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-02-06 17:03:35 +0000 |
| commit | 97975b51118d554f7049c175dfc8e67e1700fbfb (patch) | |
| tree | df3d0b8577940c651cb007d40645f396638a13e7 /ext/socket | |
| parent | 623896e8916afc72b86a44a83227afa6cebe973f (diff) | |
| download | ruby-97975b51118d554f7049c175dfc8e67e1700fbfb.tar.gz ruby-97975b51118d554f7049c175dfc8e67e1700fbfb.tar.xz ruby-97975b51118d554f7049c175dfc8e67e1700fbfb.zip | |
* instruby.rb, rubytest.rb (srcdir): no longer embed srcdir into
rbconfig.rb. (backported from CVS HEAD)
* ext/socket/extconf.rb (sockaddr_storage): winsock2.h have the
definition of struct sockaddr_storage, but socket.c doesn't
include it because this version of ruby still has binary level
compatibility with winsock1.
* lib/mkmf.rb (create_makefile): should support header files in
depend file.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@7907 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket')
| -rw-r--r-- | ext/socket/extconf.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb index 66d7462cb..772bf57f9 100644 --- a/ext/socket/extconf.rb +++ b/ext/socket/extconf.rb @@ -123,7 +123,8 @@ end cppflags = $CPPFLAGS $CPPFLAGS += flags end - if have_struct_member("struct sockaddr_storage", "ss_family", headers) + if /mswin32|mingw/ !~ RUBY_PLATFORM and + have_struct_member("struct sockaddr_storage", "ss_family", headers) $defs[-1] = "-DHAVE_SOCKADDR_STORAGE" break elsif flags |
