usa	2009-02-02 12:48:31 +0900 (Mon, 02 Feb 2009)

  New Revision: 21946

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21946

  Log:
    * ext/socket/{options,raddrinfo}.c: use INET6 instead of AF_INET6 for
      VC++6.

  Modified files:
    trunk/ChangeLog
    trunk/ext/socket/option.c
    trunk/ext/socket/raddrinfo.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 21945)
+++ ChangeLog	(revision 21946)
@@ -1,3 +1,8 @@
+Mon Feb  2 12:47:47 2009  NAKAMURA Usaku  <usa@r...>
+
+	* ext/socket/{options,raddrinfo}.c: use INET6 instead of AF_INET6 for
+	  VC++6.
+
 Mon Feb  2 12:41:52 2009  Shugo Maeda  <shugo@r...>
 
 	* complex.c (f_signbit): regard NaN as a positive value.
Index: ext/socket/raddrinfo.c
===================================================================
--- ext/socket/raddrinfo.c	(revision 21945)
+++ ext/socket/raddrinfo.c	(revision 21946)
@@ -1677,7 +1677,7 @@
     return Qfalse;
 }
 
-#ifdef AF_INET6
+#ifdef INET6
 
 static struct in6_addr *
 extract_in6_addr(VALUE self)
@@ -2094,7 +2094,7 @@
     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);
Index: ext/socket/option.c
===================================================================
--- ext/socket/option.c	(revision 21945)
+++ ext/socket/option.c	(revision 21946)
@@ -21,8 +21,10 @@
         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:

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/