[前][次][番号順一覧][スレッド一覧]

ruby-changes:14380

From: nobu <ko1@a...>
Date: Thu, 31 Dec 2009 06:03:14 +0900 (JST)
Subject: [ruby-changes:14380] Ruby:r26210 (trunk): * ext/socket/extconf.rb: use have_struct_member.

nobu	2009-12-31 06:01:13 +0900 (Thu, 31 Dec 2009)

  New Revision: 26210

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

  Log:
    * ext/socket/extconf.rb: use have_struct_member.

  Modified files:
    trunk/ext/socket/ancdata.c
    trunk/ext/socket/extconf.rb

Index: ext/socket/extconf.rb
===================================================================
--- ext/socket/extconf.rb	(revision 26209)
+++ ext/socket/extconf.rb	(revision 26210)
@@ -319,14 +319,11 @@
 have_type("struct in_pktinfo", headers) {|src|
   src.sub(%r'^/\*top\*/', '\1'"\n#if defined(IPPROTO_IP) && defined(IP_PKTINFO)") <<
   "#else\n" << "#error\n" << ">>>>>> no in_pktinfo <<<<<<\n" << "#endif\n"
-}
+} and have_struct_member("struct in_pktinfo", "ipi_spec_dst", headers)
 have_type("struct in6_pktinfo", headers) {|src|
   src.sub(%r'^/\*top\*/', '\1'"\n#if defined(IPPROTO_IPV6) && defined(IPV6_PKTINFO)") <<
   "#else\n" << "#error\n" << ">>>>>> no in6_pktinfo <<<<<<\n" << "#endif\n"
 }
-if have_struct_member("struct in_pktinfo", "ipi_spec_dst", headers)
-  $defs[-1] = "-DHAVE_IPI_SPEC_DST"
-end
 
 have_type("struct sockcred", headers)
 have_type("struct cmsgcred", headers)
Index: ext/socket/ancdata.c
===================================================================
--- ext/socket/ancdata.c	(revision 26209)
+++ ext/socket/ancdata.c	(revision 26210)
@@ -394,7 +394,7 @@
     return INT2NUM(i);
 }
 
-#if defined(IPPROTO_IP) && defined(IP_PKTINFO) && defined(HAVE_TYPE_STRUCT_IN_PKTINFO) && defined(HAVE_IPI_SPEC_DST) /* GNU/Linux */
+#if defined(IPPROTO_IP) && defined(IP_PKTINFO) && defined(HAVE_STRUCT_IN_PKTINFO_IPI_SPEC_DST) /* GNU/Linux */
 /*
  * call-seq:
  *   Socket::AncillaryData.ip_pktinfo(addr, ifindex) => ancdata
@@ -458,7 +458,7 @@
 #define ancillary_s_ip_pktinfo rb_f_notimplement
 #endif
 
-#if defined(IPPROTO_IP) && defined(IP_PKTINFO) && defined(HAVE_TYPE_STRUCT_IN_PKTINFO) && defined(HAVE_IPI_SPEC_DST) /* GNU/Linux */
+#if defined(IPPROTO_IP) && defined(IP_PKTINFO) && defined(HAVE_STRUCT_IN_PKTINFO_IPI_SPEC_DST) /* GNU/Linux */
 /*
  * call-seq:
  *   ancdata.ip_pktinfo => [addr, ifindex, spec_dst]
@@ -793,7 +793,7 @@
 }
 #endif
 
-#if defined(IPPROTO_IP) && defined(IP_PKTINFO) && defined(HAVE_TYPE_STRUCT_IN_PKTINFO) && defined(HAVE_IPI_SPEC_DST) /* GNU/Linux */
+#if defined(IPPROTO_IP) && defined(IP_PKTINFO) && defined(HAVE_STRUCT_IN_PKTINFO_IPI_SPEC_DST) /* GNU/Linux */
 static int
 anc_inspect_ip_pktinfo(int level, int type, VALUE data, VALUE ret)
 {
@@ -1045,7 +1045,7 @@
 #            if defined(IP_RECVDSTADDR) /* 4.4BSD */
               case IP_RECVDSTADDR: inspected = anc_inspect_ip_recvdstaddr(level, type, data, ret); break;
 #            endif
-#            if defined(IP_PKTINFO) && defined(HAVE_TYPE_STRUCT_IN_PKTINFO) && defined(HAVE_IPI_SPEC_DST) /* GNU/Linux */
+#            if defined(IP_PKTINFO) && defined(HAVE_STRUCT_IN_PKTINFO_IPI_SPEC_DST) /* GNU/Linux */
               case IP_PKTINFO: inspected = anc_inspect_ip_pktinfo(level, type, data, ret); break;
 #            endif
             }

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

[前][次][番号順一覧][スレッド一覧]