summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-22 08:30:41 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-22 08:30:41 +0000
commit6b7603194da41c578ffb79f937106f39424a97ca (patch)
tree36a0976a03fbc4ae76461cd026057db19aecbf6e
parente1f50e25647e18aa4894f19f1abb6cb8ded1113c (diff)
* ext/socket/extconf.rb: enable ipv6 support for win32.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ext/socket/extconf.rb2
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b84c123f76..4ab3ba933e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jul 22 17:29:59 2009 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/socket/extconf.rb: enable ipv6 support for win32.
+
Wed Jul 22 16:38:39 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* hash.c (Hash::[]): rdoc. patch by Marc-Andre Lafortune.
diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb
index 79c9d30b36..548abd4f7c 100644
--- a/ext/socket/extconf.rb
+++ b/ext/socket/extconf.rb
@@ -37,7 +37,9 @@ default_ipv6 = /cygwin|beos|haiku/ !~ RUBY_PLATFORM
if enable_config("ipv6", default_ipv6)
if checking_for("ipv6") {try_link(<<EOF)}
#include <sys/types.h>
+#ifndef _WIN32
#include <sys/socket.h>
+#endif
int
main()
{