shyouhei	2008-06-15 21:07:53 +0900 (Sun, 15 Jun 2008)

  New Revision: 17224

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/lib/resolv.rb
    branches/ruby_1_8_5/version.h

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


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=17224&r2=17223&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=17224&r2=17223&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/lib/resolv.rb?r1=17224&r2=17223&diff_format=u

Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 17223)
+++ ruby_1_8_5/ChangeLog	(revision 17224)
@@ -1,3 +1,8 @@
+Sun Jun 15 21:07:37 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/resolv.rb (Resolv::Config.default_config_hash): requires
+	  win32/resolv to use Win32::Resolv.  [ruby-dev:34138]
+
 Sun Jun 15 20:52:45 2008  Akinori MUSHA  <knu@i...>
 
 	* parse.y (yycompile): Always prepare a new array for each file's
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 17223)
+++ ruby_1_8_5/version.h	(revision 17224)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-15"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080615
-#define RUBY_PATCHLEVEL 189
+#define RUBY_PATCHLEVEL 190
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_5/lib/resolv.rb
===================================================================
--- ruby_1_8_5/lib/resolv.rb	(revision 17223)
+++ ruby_1_8_5/lib/resolv.rb	(revision 17224)
@@ -759,6 +759,7 @@
           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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/