diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/socket/option.c | 2 | ||||
| -rw-r--r-- | ext/socket/raddrinfo.c | 4 |
3 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Mon Feb 2 12:47:47 2009 NAKAMURA Usaku <usa@ruby-lang.org> + + * ext/socket/{options,raddrinfo}.c: use INET6 instead of AF_INET6 for + VC++6. + Mon Feb 2 12:41:52 2009 Shugo Maeda <shugo@ruby-lang.org> * complex.c (f_signbit): regard NaN as a positive value. diff --git a/ext/socket/option.c b/ext/socket/option.c index f815528fef..ae6e2dd1c2 100644 --- a/ext/socket/option.c +++ b/ext/socket/option.c @@ -21,8 +21,10 @@ optname_to_sym(int level, int optname) return constant_to_sym(optname, intern_so_optname); case IPPROTO_IP: return constant_to_sym(optname, intern_ip_optname); +#ifdef IPV6 case IPPROTO_IPV6: return constant_to_sym(optname, intern_ipv6_optname); +#endif case IPPROTO_TCP: return constant_to_sym(optname, intern_tcp_optname); case IPPROTO_UDP: diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c index 634a68d221..fb8d3418fc 100644 --- a/ext/socket/raddrinfo.c +++ b/ext/socket/raddrinfo.c @@ -1677,7 +1677,7 @@ addrinfo_ipv4_multicast_p(VALUE self) return Qfalse; } -#ifdef AF_INET6 +#ifdef INET6 static struct in6_addr * extract_in6_addr(VALUE self) @@ -2094,7 +2094,7 @@ Init_addrinfo(void) rb_define_method(rb_cAddrInfo, "ipv4_loopback?", addrinfo_ipv4_loopback_p, 0); rb_define_method(rb_cAddrInfo, "ipv4_multicast?", addrinfo_ipv4_multicast_p, 0); -#ifdef AF_INET6 +#ifdef INET6 rb_define_method(rb_cAddrInfo, "ipv6_unspecified?", addrinfo_ipv6_unspecified_p, 0); rb_define_method(rb_cAddrInfo, "ipv6_loopback?", addrinfo_ipv6_loopback_p, 0); rb_define_method(rb_cAddrInfo, "ipv6_multicast?", addrinfo_ipv6_multicast_p, 0); |