* 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
This commit is contained in:
kanemoto 2009-10-28 16:41:33 +00:00
Родитель feb34709fe
Коммит 501e9360dd
2 изменённых файлов: 9 добавлений и 1 удалений

Просмотреть файл

@ -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> Wed Oct 28 16:32:49 2009 NARUSE, Yui <naruse@ruby-lang.org>
* encoding.c (get_filesystem_encoding): removed. * encoding.c (get_filesystem_encoding): removed.

Просмотреть файл

@ -97,8 +97,10 @@ end
# doug's fix, NOW add -Dss_family... only if required! # doug's fix, NOW add -Dss_family... only if required!
doug = proc {have_struct_member("struct sockaddr_storage", "ss_family", headers)} doug = proc {have_struct_member("struct sockaddr_storage", "ss_family", headers)}
if (doug[] or 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" $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 end
if have_struct_member("struct sockaddr", "sa_len", headers) if have_struct_member("struct sockaddr", "sa_len", headers)