diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-30 21:01:13 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-30 21:01:13 +0000 |
| commit | 72d10b2776372e4cd507bdbaed7acd2bcdb1473b (patch) | |
| tree | cd894f389873ba06eba80bad428032e5e0c83845 | |
| parent | da775e235570e38de38322a180a741d0406c9be4 (diff) | |
| download | ruby-72d10b2776372e4cd507bdbaed7acd2bcdb1473b.tar.gz ruby-72d10b2776372e4cd507bdbaed7acd2bcdb1473b.tar.xz ruby-72d10b2776372e4cd507bdbaed7acd2bcdb1473b.zip | |
* ext/socket/extconf.rb: use have_struct_member.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@26210 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ext/socket/ancdata.c | 8 | ||||
| -rw-r--r-- | ext/socket/extconf.rb | 5 |
2 files changed, 5 insertions, 8 deletions
diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c index 8714add1d..370e5b59e 100644 --- a/ext/socket/ancdata.c +++ b/ext/socket/ancdata.c @@ -394,7 +394,7 @@ ancillary_int(VALUE self) 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 @@ ancillary_s_ip_pktinfo(int argc, VALUE *argv, VALUE self) #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 @@ anc_inspect_ip_recvdstaddr(int level, int type, VALUE data, VALUE ret) } #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 @@ ancillary_inspect(VALUE self) # 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 } diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb index 7b744b424..bebbf97ac 100644 --- a/ext/socket/extconf.rb +++ b/ext/socket/extconf.rb @@ -319,14 +319,11 @@ have_header("sys/uio.h") 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) |