diff options
| author | kanemoto <kanemoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-11-12 16:01:28 +0000 |
|---|---|---|
| committer | kanemoto <kanemoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-11-12 16:01:28 +0000 |
| commit | dcad53d3bc3e4e716abfd63a813cecb496723923 (patch) | |
| tree | e41b13cfc52cb3438aa89c03fb8d14d30a1ba24f /ext | |
| parent | 9ca073576ca27c4af316720aa0aec2da2230c021 (diff) | |
merges r24482, r25061, r25124, r25126, r25552 from trunk into ruby_1_9_1.
These patches are for AIX compilation issues. This commit is allowed by
branch master (yugui). Thanks!
* 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.
* Makefile.in (miniruby): suppress duplication warning on AIX.
* common.mk (ruby.imp): add text section [Bug #2064].
* common.mk (ruby.imp): do not export Init_*.
* dln.c (aix_loaderror): fixed typo. suppress warnings.
* common.mk (ruby.imp): excluded prelude.o to get rid of circular
dependency. [ruby-dev:39052]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@25740 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/socket/extconf.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb index 99deaf8793..2001a710e4 100644 --- a/ext/socket/extconf.rb +++ b/ext/socket/extconf.rb @@ -92,8 +92,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) |