From a0fa43b0948f1811f3965d0965afc9b5b3bbb9f0 Mon Sep 17 00:00:00 2001 From: akr Date: Thu, 25 Apr 2013 09:17:54 +0000 Subject: [PATCH] * ext/socket/extconf.rb: Don't use WIDE getaddrinfo by default. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40466 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ ext/socket/extconf.rb | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index dc1076e359..7beafdc377 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu Apr 25 18:15:46 2013 Tanaka Akira + + * ext/socket/extconf.rb: Don't use WIDE getaddrinfo by default. + Thu Apr 25 17:56:39 2013 Tanaka Akira * ext/socket/extconf.rb: Remove obsolete options: ---with-ipv6-lib and diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb index afdb6368f7..d7bae22727 100644 --- a/ext/socket/extconf.rb +++ b/ext/socket/extconf.rb @@ -484,7 +484,7 @@ EOS when nil if have_func("getnameinfo", headers) and have_func("getaddrinfo", headers) getaddr_info_ok = :os - if !CROSS_COMPILING && checking_for("wide getaddrinfo") {try_run(cpp_include(headers) + GETADDRINFO_GETNAMEINFO_TEST)} + if !CROSS_COMPILING && !checking_for("wide getaddrinfo") {try_run(cpp_include(headers) + GETADDRINFO_GETNAMEINFO_TEST)} getaddr_info_ok = :wide end else @@ -493,7 +493,7 @@ EOS when false if have_func("getnameinfo", headers) and have_func("getaddrinfo", headers) getaddr_info_ok = :os - if !CROSS_COMPILING && checking_for("wide getaddrinfo") {try_run(cpp_include(headers) + GETADDRINFO_GETNAMEINFO_TEST)} + if !CROSS_COMPILING && !checking_for("wide getaddrinfo") {try_run(cpp_include(headers) + GETADDRINFO_GETNAMEINFO_TEST)} getaddr_info_ok = nil end else