git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39183 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2013-02-10 03:29:37 +00:00
Родитель 1ab6dccf4b
Коммит 474e3cd2a7
1 изменённых файлов: 3 добавлений и 3 удалений

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

@ -114,20 +114,20 @@ EOS
end end
if have_struct_member("struct sockaddr_in", "sin_len", headers) if have_struct_member("struct sockaddr_in", "sin_len", headers)
$defs[-1] = "-DHAVE_SIN_LEN" $defs[-1] = "-DHAVE_SIN_LEN" # change from -DHAVE_ST_SIN_LEN.
end 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", &doug)) with_cppflags($CPPFLAGS + " -Dss_family=__ss_family", &doug))
$defs[-1] = "-DHAVE_SOCKADDR_STORAGE" $defs[-1] = "-DHAVE_SOCKADDR_STORAGE" # change from -DHAVE_ST_SS_FAMILY.
doug = proc {have_struct_member("struct sockaddr_storage", "ss_len", headers)} doug = proc {have_struct_member("struct sockaddr_storage", "ss_len", headers)}
doug[] or with_cppflags($CPPFLAGS + " -Dss_len=__ss_len", &doug) 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)
$defs[-1] = "-DHAVE_SA_LEN " $defs[-1] = "-DHAVE_SA_LEN " # change from -DHAVE_ST_SA_LEN.
end end
if !have_macro("IPPROTO_IPV6", headers) && have_const("IPPROTO_IPV6", headers) if !have_macro("IPPROTO_IPV6", headers) && have_const("IPPROTO_IPV6", headers)