From 370647ac58e0997839a030eb69b5354a5bd7cf70 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 6 Feb 2005 17:03:35 +0000
Subject: * 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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7907 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/socket/extconf.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'ext/socket/extconf.rb')

diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb
index 66d7462cbf..772bf57f9f 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
-- 
cgit v1.2.3