takano32	2009-03-18 17:04:17 +0900 (Wed, 18 Mar 2009)

  New Revision: 23003

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

  Log:
    * ext/socket/ancdata.c: not use pktinfo.ipi_spec_dst if not defined
    * ext/socket/extconf.rb: define HAVE_IPI_SPEC_DST

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 23002)
+++ ChangeLog	(revision 23003)
@@ -3,6 +3,11 @@
 	* test/test_syslog.rb (TestSyslog#test_open): check
 	  param after block again. because detect not to call block.
 
+Wed Mar 18 16:54:04 2009  TAKANO Mitsuhiro (takano32)  <tak@n...>
+
+	* ext/socket/ancdata.c: not use pktinfo.ipi_spec_dst if not defined
+	* ext/socket/extconf.rb: define HAVE_IPI_SPEC_DST
+
 Wed Mar 18 16:38:11 2009  Kazuhiro NISHIYAMA  <zn@m...>
 
 	* test/test_syslog.rb (TestSyslog#test_open): check
Index: ext/socket/extconf.rb
===================================================================
--- ext/socket/extconf.rb	(revision 23002)
+++ ext/socket/extconf.rb	(revision 23003)
@@ -310,6 +310,9 @@
   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 23002)
+++ ext/socket/ancdata.c	(revision 23003)
@@ -414,7 +414,7 @@
 static VALUE
 ancillary_s_ip_pktinfo(int argc, VALUE *argv, VALUE self)
 {
-#if defined(IPPROTO_IP) && defined(IP_PKTINFO) && defined(HAVE_TYPE_STRUCT_IN_PKTINFO) /* GNU/Linux */
+#if defined(IPPROTO_IP) && defined(IP_PKTINFO) && defined(HAVE_TYPE_STRUCT_IN_PKTINFO) && defined(HAVE_IPI_SPEC_DST) /* GNU/Linux */
     VALUE v_addr, v_ifindex, v_spec_dst;
     unsigned int ifindex;
     struct sockaddr_in sa;
@@ -477,7 +477,7 @@
 static VALUE
 ancillary_ip_pktinfo(VALUE self)
 {
-#if defined(IPPROTO_IP) && defined(IP_PKTINFO) && defined(HAVE_TYPE_STRUCT_IN_PKTINFO) /* GNU/Linux */
+#if defined(IPPROTO_IP) && defined(IP_PKTINFO) && defined(HAVE_TYPE_STRUCT_IN_PKTINFO) && defined(HAVE_IPI_SPEC_DST) /* GNU/Linux */
     int level, type;
     VALUE data;
     struct in_pktinfo pktinfo;
@@ -790,7 +790,7 @@
 }
 #endif
 
-#if defined(IPPROTO_IP) && defined(IP_PKTINFO) && defined(HAVE_TYPE_STRUCT_IN_PKTINFO) /* GNU/Linux */
+#if defined(IPPROTO_IP) && defined(IP_PKTINFO) && defined(HAVE_TYPE_STRUCT_IN_PKTINFO) && defined(HAVE_IPI_SPEC_DST) /* GNU/Linux */
 static int
 anc_inspect_ip_pktinfo(int level, int type, VALUE data, VALUE ret)
 {
@@ -1042,7 +1042,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) /* GNU/Linux */
+#            if defined(IP_PKTINFO) && defined(HAVE_TYPE_STRUCT_IN_PKTINFO) && defined(HAVE_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/