usa	2010-05-19 22:48:50 +0900 (Wed, 19 May 2010)

  New Revision: 27902

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

  Log:
    merge from trunk (r27893)
    
    * ext/socket/extconf.rb: mswin/mingw ruby has socketpair(), but it's
      not exist as such name in ruby static library, so mkmf.rb cannot
      find it.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/ext/socket/extconf.rb

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 27901)
+++ ruby_1_9_2/ChangeLog	(revision 27902)
@@ -1,3 +1,9 @@
+Wed May 19 22:48:06 2010  NAKAMURA Usaku  <usa@r...>
+
+	* ext/socket/extconf.rb: mswin/mingw ruby has socketpair(), but it's
+	  not exist as such name in ruby static library, so mkmf.rb cannot
+	  find it.
+
 Wed May 19 20:09:38 2010  Yusuke Endoh  <mame@t...>
 
 	* vm_eval.c (rb_f_caller): return [] instead of nil when the function
Index: ruby_1_9_2/ext/socket/extconf.rb
===================================================================
--- ruby_1_9_2/ext/socket/extconf.rb	(revision 27901)
+++ ruby_1_9_2/ext/socket/extconf.rb	(revision 27902)
@@ -4,6 +4,7 @@
 when /(ms|bcc)win32|mingw/
   test_func = "WSACleanup"
   have_library("ws2_32", "WSACleanup")
+  $defs << "-DHAVE_SOCKETPAIR"
 when /cygwin/
   test_func = "socket"
 when /beos/
@@ -348,7 +349,7 @@
 if have_func(test_func)
   have_func("hsterror")
   have_func("getipnodebyname") or have_func("gethostbyname2")
-  have_func("socketpair")
+  have_func("socketpair") unless $defs.include?("-DHAVE_SOCKETPAIR")
   unless have_func("gethostname")
     have_func("uname")
   end

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