mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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@15869 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
b9bdeb035c
commit
84ee429e83
3 changed files with 10 additions and 4 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
Tue Apr 1 01:55:52 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 Mar 30 07:00:32 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
Sun Mar 30 07:00:32 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* ext/tk/tcltklib.c: rb_hash_lookup has not been backported yet.
|
* ext/tk/tcltklib.c: rb_hash_lookup has not been backported yet.
|
||||||
|
|
|
@ -785,6 +785,7 @@ class Resolv
|
||||||
config_hash = Config.parse_resolv_conf(filename)
|
config_hash = Config.parse_resolv_conf(filename)
|
||||||
else
|
else
|
||||||
if /mswin32|cygwin|mingw|bccwin/ =~ RUBY_PLATFORM
|
if /mswin32|cygwin|mingw|bccwin/ =~ RUBY_PLATFORM
|
||||||
|
require 'win32/resolv'
|
||||||
search, nameserver = Win32::Resolv.get_resolv_info
|
search, nameserver = Win32::Resolv.get_resolv_info
|
||||||
config_hash = {}
|
config_hash = {}
|
||||||
config_hash[:nameserver] = nameserver if nameserver
|
config_hash[:nameserver] = nameserver if nameserver
|
||||||
|
|
|
@ -1,15 +1,15 @@
|
||||||
#define RUBY_VERSION "1.8.6"
|
#define RUBY_VERSION "1.8.6"
|
||||||
#define RUBY_RELEASE_DATE "2008-03-30"
|
#define RUBY_RELEASE_DATE "2008-04-01"
|
||||||
#define RUBY_VERSION_CODE 186
|
#define RUBY_VERSION_CODE 186
|
||||||
#define RUBY_RELEASE_CODE 20080330
|
#define RUBY_RELEASE_CODE 20080401
|
||||||
#define RUBY_PATCHLEVEL 5000
|
#define RUBY_PATCHLEVEL 5000
|
||||||
|
|
||||||
#define RUBY_VERSION_MAJOR 1
|
#define RUBY_VERSION_MAJOR 1
|
||||||
#define RUBY_VERSION_MINOR 8
|
#define RUBY_VERSION_MINOR 8
|
||||||
#define RUBY_VERSION_TEENY 6
|
#define RUBY_VERSION_TEENY 6
|
||||||
#define RUBY_RELEASE_YEAR 2008
|
#define RUBY_RELEASE_YEAR 2008
|
||||||
#define RUBY_RELEASE_MONTH 3
|
#define RUBY_RELEASE_MONTH 4
|
||||||
#define RUBY_RELEASE_DAY 30
|
#define RUBY_RELEASE_DAY 1
|
||||||
|
|
||||||
#ifdef RUBY_EXTERN
|
#ifdef RUBY_EXTERN
|
||||||
RUBY_EXTERN const char ruby_version[];
|
RUBY_EXTERN const char ruby_version[];
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue