From ba02b2d689893b4ed12b1f01bf68a46f851f2bf9 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sun, 15 Jun 2008 11:30:20 +0000 Subject: merge revision(s) 15823: * lib/resolv.rb (Resolv::Hosts): should not use win32/resolv on cygwin. [ruby-dev:29945], [ruby-dev:34095] * lib/win32/registry.rb (Win32::Registry.expand_environ): try upcased name too for cygwin. [ruby-dev:29945] * lib/win32/resolv.rb (Win32::Resolv.get_hosts_path): use expand_path. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17214 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/resolv.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/resolv.rb b/lib/resolv.rb index 49e40bdf07..898686fd3e 100644 --- a/lib/resolv.rb +++ b/lib/resolv.rb @@ -278,7 +278,7 @@ class Resolv end class Hosts - if /mswin32|cygwin|mingw|bccwin/ =~ RUBY_PLATFORM + if /mswin32|mingw|bccwin/ =~ RUBY_PLATFORM require 'win32/resolv' DefaultFileName = Win32::Resolv.get_hosts_path else -- cgit v1.2.3