From 501e9360dd16fd34db8e829a206ed5484628caa3 Mon Sep 17 00:00:00 2001 From: kanemoto Date: Wed, 28 Oct 2009 16:41:33 +0000 Subject: [PATCH] * ext/socket/extconf.rb : Compilation failure on AIX. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25552 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ ext/socket/extconf.rb | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b68f337f60..9e510835b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Oct 29 01:22:01 2009 Yutaka Kanemoto + + * ext/socket/extconf.rb : Compilation failure on AIX. + ss_len (a member of struct sockaddr_storage) has preceding __, + but ss_family does not have it from AIX 5.2. + Wed Oct 28 16:32:49 2009 NARUSE, Yui * encoding.c (get_filesystem_encoding): removed. diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb index 1d233fdd1f..8b0f2eb110 100644 --- a/ext/socket/extconf.rb +++ b/ext/socket/extconf.rb @@ -97,8 +97,10 @@ end # doug's fix, NOW add -Dss_family... only if required! doug = proc {have_struct_member("struct sockaddr_storage", "ss_family", headers)} if (doug[] or - with_cppflags($CPPFLAGS + " -Dss_family=__ss_family -Dss_len=__ss_len", &doug)) + with_cppflags($CPPFLAGS + " -Dss_family=__ss_family", &doug)) $defs[-1] = "-DHAVE_SOCKADDR_STORAGE" + doug = proc {have_struct_member("struct sockaddr_storage", "ss_len", headers)} + doug[] or with_cppflags($CPPFLAGS + " -Dss_len=__ss_len", &doug) end if have_struct_member("struct sockaddr", "sa_len", headers)