summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ext/socket/extconf.rb3
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9f7cf26ea6..4a0b034d96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed May 19 19:58:01 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * 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 19:45:10 2010 Yusuke Endoh <mame@tsg.ne.jp>
* iseq_compile_each (NODE_DEFINED): put nil first to fix stack
diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb
index 71deaa218d..7c31030d72 100644
--- a/ext/socket/extconf.rb
+++ b/ext/socket/extconf.rb
@@ -4,6 +4,7 @@ case RUBY_PLATFORM
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 @@ $distcleanfiles << "constants.h" << "constdefs.*"
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