From 32c19cdc391d6c9149e9fa3e917697bf9ac97d4d Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 8 Feb 2015 01:35:18 +0000 Subject: socket/extconf.rb: reduce duplicated code * ext/socket/extconf.rb: reduce duplicated code. set fallback value first, then check OS-provided functions. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49539 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/socket/extconf.rb | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) (limited to 'ext/socket') diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb index c4523da24d..931ff990fb 100644 --- a/ext/socket/extconf.rb +++ b/ext/socket/extconf.rb @@ -565,29 +565,15 @@ EOS case enable_config("wide-getaddrinfo") when true getaddr_info_ok = :wide - when nil + when nil, false + getaddr_info_ok = (:wide if getaddr_info_ok.nil?) if have_func("getnameinfo", headers) and have_func("getaddrinfo", headers) - getaddr_info_ok = :os - if !CROSS_COMPILING && - !checking_for("system getaddrinfo working") { + if CROSS_COMPILING || + checking_for("system getaddrinfo working") { try_run(cpp_include(headers) + GETADDRINFO_GETNAMEINFO_TEST) } - getaddr_info_ok = :wide + getaddr_info_ok = :os end - else - getaddr_info_ok = :wide - end - when false - if have_func("getnameinfo", headers) and have_func("getaddrinfo", headers) - getaddr_info_ok = :os - if !CROSS_COMPILING && - !checking_for("system getaddrinfo working") { - try_run(cpp_include(headers) + GETADDRINFO_GETNAMEINFO_TEST) - } - getaddr_info_ok = nil - end - else - getaddr_info_ok = nil end else raise "unexpected enable_config() value" -- cgit v1.2.3