From 45633971cc46b6e68f64dc8b9056e4a1381b2bcd Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sun, 15 Jun 2008 12:07:53 +0000 Subject: 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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17224 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/resolv.rb | 1 + version.h | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7808220d34..8e292e3aef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jun 15 21:07:37 2008 Nobuyoshi Nakada + + * 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 * parse.y (yycompile): Always prepare a new array for each file's diff --git a/lib/resolv.rb b/lib/resolv.rb index 898686fd3e..1792fd8178 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 113b1b9fa1..74238ab61d 100644 --- a/version.h +++ b/version.h @@ -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 -- cgit v1.2.3