From 8282bdbf559929c9265bf15c8dc10bc350a895d4 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 7 Jun 2006 01:51:47 +0000
Subject: * win32/{configure.bat, setup.mak, Makefile.sub, win32.h}: add  
 support new configure option `--with-winsock2'.

* win32/win32.c (StartSockets): ditto.

* ext/socket/extconf.rb: ditto.

* win32/win32.c (open_ifs_socket): new function.

* win32/win32.c (StartSockets, rb_w32_socket): use open_ifs_socket()
  instead of socket().
  ifs socket support is backported from trunk.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@10223 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/socket/extconf.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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

diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb
index 5ee30a222..6469535ca 100644
--- a/ext/socket/extconf.rb
+++ b/ext/socket/extconf.rb
@@ -6,7 +6,11 @@ when /bccwin32/
   have_library("ws2_32", "WSACleanup")
 when /mswin32|mingw/
   test_func = "WSACleanup"
-  have_library("wsock32", "WSACleanup")
+  if /USE_WINSOCK2/ =~ $CPPFLAGS
+    have_library("ws2_32", "WSACleanup")
+  else
+    have_library("wsock32", "WSACleanup")
+  end
 when /cygwin/
   test_func = "socket"
 when /beos/
-- 
cgit