From 8371969dc57d3451b378c05cb2e08b8b98ec1fbc Mon Sep 17 00:00:00 2001 From: kanemoto Date: Thu, 12 Nov 2009 16:01:28 +0000 Subject: 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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@25740 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/socket/extconf.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'ext/socket') diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb index 99deaf879..2001a710e 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) -- cgit