diff options
| author | kanemoto <kanemoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-28 16:41:33 +0000 |
|---|---|---|
| committer | kanemoto <kanemoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-28 16:41:33 +0000 |
| commit | 51251d0aea167ca3606151b34dc1b5623269e549 (patch) | |
| tree | d99da72341d75e9fad72f0882df75379fb1652f8 | |
| parent | e8e8989fee0c62b0ee0a6376e6a80008f0a76a67 (diff) | |
| download | ruby-51251d0aea167ca3606151b34dc1b5623269e549.tar.gz ruby-51251d0aea167ca3606151b34dc1b5623269e549.tar.xz ruby-51251d0aea167ca3606151b34dc1b5623269e549.zip | |
* ext/socket/extconf.rb : Compilation failure on AIX.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@25552 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/socket/extconf.rb | 4 |
2 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Thu Oct 29 01:22:01 2009 Yutaka Kanemoto <kanemoto@ruby-lang.org> + + * 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 <naruse@ruby-lang.org> * encoding.c (get_filesystem_encoding): removed. diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb index 1d233fdd1..8b0f2eb11 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) |