summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ext/socket/mkconstants.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6d50be1..b394998 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul 22 19:32:10 2009 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/socket/mkconstants.rb: define IPV6_* constants only when INET6
+ is defined.
+
Wed Jul 22 19:23:04 2009 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/socket/extconf.rb: ipv6 support is disabled by default on mswin.
diff --git a/ext/socket/mkconstants.rb b/ext/socket/mkconstants.rb
index 3074a8f..6df8fbe 100644
--- a/ext/socket/mkconstants.rb
+++ b/ext/socket/mkconstants.rb
@@ -56,7 +56,7 @@ def each_const
make_value = "INT2NUM"
end
guard = nil
- if /\A(AF_INET6|PF_INET6)\z/ =~ name
+ if /\A(AF_INET6|PF_INET6|IPV6_.*)\z/ =~ name
# IPv6 is not supported although AF_INET6 is defined on bcc32/mingw
guard = "defined(INET6)"
end