nobu	2009-01-04 09:27:43 +0900 (Sun, 04 Jan 2009)

  New Revision: 21296

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

  Log:
    * ext/socket/socket.c (constant_arg): constified.
    * ext/socket/socket.c (optname_arg): cygwin does not have
      IPPROTO_IPV6.
    
    * ext/socket/mkconstants.rb (ipv6_optname_to_int): ditto.

  Modified files:
    trunk/ChangeLog
    trunk/ext/socket/mkconstants.rb
    trunk/ext/socket/socket.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 21295)
+++ ChangeLog	(revision 21296)
@@ -1,3 +1,12 @@
+Sun Jan  4 09:27:41 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/socket/socket.c (constant_arg): constified.
+
+	* ext/socket/socket.c (optname_arg): cygwin does not have
+	  IPPROTO_IPV6.
+
+	* ext/socket/mkconstants.rb (ipv6_optname_to_int): ditto.
+
 Sun Jan  4 04:33:14 2009  Tanaka Akira  <akr@f...>
 
 	* ext/socket/socket.c: redundant #ifdef removed.
Index: ext/socket/mkconstants.rb
===================================================================
--- ext/socket/mkconstants.rb	(revision 21295)
+++ ext/socket/mkconstants.rb	(revision 21296)
@@ -228,11 +228,13 @@
 <%= gen_name_to_int("str", "len", "valp", /\AIP_/, "IP_") %>
 }
 
+#ifdef IPPROTO_IPV6
 static int
 ipv6_optname_to_int(char *str, int len, int *valp)
 {
 <%= gen_name_to_int("str", "len", "valp", /\AIPV6_/, "IPV6_") %>
 }
+#endif
 
 static int
 tcp_optname_to_int(char *str, int len, int *valp)
Index: ext/socket/socket.c
===================================================================
--- ext/socket/socket.c	(revision 21295)
+++ ext/socket/socket.c	(revision 21296)
@@ -242,7 +242,7 @@
 #endif
 
 static int
-constant_arg(VALUE arg, int (*str_to_int)(char*, int, int*), char *errmsg)
+constant_arg(VALUE arg, int (*str_to_int)(char*, int, int*), const char *errmsg)
 {
     VALUE tmp;
     char *ptr;
@@ -295,8 +295,10 @@
         return constant_arg(optname, so_optname_to_int, "unknown socket level option name");
       case IPPROTO_IP:
         return constant_arg(optname, ip_optname_to_int, "unknown IP level option name");
+#ifdef IPPROTO_IPV6
       case IPPROTO_IPV6:
         return constant_arg(optname, ipv6_optname_to_int, "unknown IPv6 level option name");
+#endif
       case IPPROTO_TCP:
         return constant_arg(optname, tcp_optname_to_int, "unknown TCP level option name");
       case IPPROTO_UDP:

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