summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-03 16:29:23 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-03 16:29:23 +0000
commitdaf1a9ffe21aee93a9918824328d8bb404e311d4 (patch)
treee362feb15b58747dcfb7291d35fc867cbee71eef
parenta20e7896a7d8c56276cf47b025bc0ea54e547df2 (diff)
downloadruby-daf1a9ffe21aee93a9918824328d8bb404e311d4.tar.gz
ruby-daf1a9ffe21aee93a9918824328d8bb404e311d4.tar.xz
ruby-daf1a9ffe21aee93a9918824328d8bb404e311d4.zip
* ext/socket/extconf.rb: fix struct in_pktinfo and struct in6_pktinfo
detection. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@22022 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/socket/extconf.rb8
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 2b440bda9..76490ab8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Feb 4 01:28:46 2009 Tanaka Akira <akr@fsij.org>
+
+ * ext/socket/extconf.rb: fix struct in_pktinfo and struct in6_pktinfo
+ detection.
+
Wed Feb 4 00:32:59 2009 Yusuke Endoh <mame@tsg.ne.jp>
* test/etc/test_etc.rb(test_getpwnam, test_getgrgid, test_getgrnam):
diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb
index f4d92066b..d610657a1 100644
--- a/ext/socket/extconf.rb
+++ b/ext/socket/extconf.rb
@@ -299,13 +299,13 @@ end
have_header("sys/un.h")
have_header("sys/uio.h")
-have_type("struct in_pktinfo") {|src|
+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"
+ "#else\n" << "#error no in_pktinfo\n" << "#endif\n"
}
-have_type("struct in6_pktinfo") {|src|
+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"
+ "#else\n" << "#error no in6_pktinfo\n" << "#endif\n"
}
$distcleanfiles << "constants.h" << "constdefs.*"