merge revision(s) 15869:

	* lib/resolv.rb (Resolv::Config.default_config_hash): requires
	  win32/resolv to use Win32::Resolv.  [ruby-dev:34138]


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@17226 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 91e934aa4..e9a49feb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jun 15 21:08:10 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/resolv.rb (Resolv::Config.default_config_hash): requires
+	  win32/resolv to use Win32::Resolv.  [ruby-dev:34138]
+
 Sun Jun 15 20:54:07 2008  Akinori MUSHA  <knu@iDaemons.org>
 
 	* parse.y (yycompile): Always prepare a new array for each file's
diff --git a/lib/resolv.rb b/lib/resolv.rb
index 898686fd3..1792fd817 100644
--- a/lib/resolv.rb
+++ b/lib/resolv.rb
@@ -759,6 +759,7 @@ class Resolv
           config_hash = Config.parse_resolv_conf(filename)
         else
           if /mswin32|cygwin|mingw|bccwin/ =~ RUBY_PLATFORM
+            require 'win32/resolv'
             search, nameserver = Win32::Resolv.get_resolv_info
             config_hash = {}
             config_hash[:nameserver] = nameserver if nameserver
diff --git a/version.h b/version.h
index 73c2ec8a7..2488915b4 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-15"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20080615
-#define RUBY_PATCHLEVEL 190
+#define RUBY_PATCHLEVEL 191
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8