summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-12-08 03:59:10 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-12-08 03:59:10 +0000
commit2470d7811fcd2d19e0075e171b2ffc106ddd9d91 (patch)
tree18c9ee21ed074cbaaf88be71cc49e7fb262a9be1
parentf2747b578245160fd900af7cdd828360ec7939a5 (diff)
* ext/socket/extconf.rb: forgotten to define HAVE_SOCKETPAIR for
windows. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33979 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/socket/extconf.rb1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 90f4d8232d..ab1b39d4a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec 8 12:57:50 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/socket/extconf.rb: forgotten to define HAVE_SOCKETPAIR for
+ windows.
+
Thu Dec 8 12:11:06 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (RUBY_WERROR_FLAG): append all warning flags which
diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb
index ba180c820e..2e308fe1ab 100644
--- a/ext/socket/extconf.rb
+++ b/ext/socket/extconf.rb
@@ -485,6 +485,7 @@ if have_func(test_func)
have_func("getipnodebyname") or have_func("gethostbyname2")
if !have_func("socketpair(0, 0, 0, 0)") and have_func("rb_w32_socketpair(0, 0, 0, 0)")
$defs << "-Dsocketpair(a,b,c,d)=rb_w32_socketpair((a),(b),(c),(d))"
+ $defs << "-DHAVE_SOCKETPAIR"
end
unless have_func("gethostname((char *)0, 0)")
have_func("uname")