diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-26 23:42:03 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-26 23:42:03 +0000 |
| commit | 52659f509bcabca31feb58d3e43e11983e3092d7 (patch) | |
| tree | b7f314308d3f383ff46f9bf86f2b5b8f698469db | |
| parent | bb88a5a201e1a0b520f68d6861f5ce2d62c13fe9 (diff) | |
* ext/dl/extconf.rb, ext/iconv/charset_alias.rb: use RbConfig.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@29943 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ext/dl/extconf.rb | 2 | ||||
| -rw-r--r-- | ext/iconv/charset_alias.rb | 4 | ||||
| -rw-r--r-- | version.h | 6 | ||||
| -rwxr-xr-x | win32/resource.rb | 2 |
5 files changed, 11 insertions, 7 deletions
@@ -1,3 +1,7 @@ +Sat Nov 27 08:42:01 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/dl/extconf.rb, ext/iconv/charset_alias.rb: use RbConfig. + Fri Nov 26 10:09:09 2010 NAKAMURA Usaku <usa@ruby-lang.org> * win32/Makefile.sub (WARNFLAGS): shut up the meaningless warnings of diff --git a/ext/dl/extconf.rb b/ext/dl/extconf.rb index beb15ab04c..20a45a127d 100644 --- a/ext/dl/extconf.rb +++ b/ext/dl/extconf.rb @@ -22,7 +22,7 @@ end ($CPPFLAGS || $CFLAGS) << " -I." -if (Config::CONFIG['CC'] =~ /gcc/) # from Win32API +if (RbConfig::CONFIG['CC'] =~ /gcc/) # from Win32API $CFLAGS << " -fno-defer-pop -fno-omit-frame-pointer" end diff --git a/ext/iconv/charset_alias.rb b/ext/iconv/charset_alias.rb index af10e7cc47..e9d3bb11ec 100644 --- a/ext/iconv/charset_alias.rb +++ b/ext/iconv/charset_alias.rb @@ -6,8 +6,8 @@ require 'optparse' # http://www.ctan.org/get/macros/texinfo/texinfo/gnulib/lib/config.charset # Tue, 25 Dec 2007 00:00:00 GMT -OS = Config::CONFIG["target_os"] -SHELL = Config::CONFIG['SHELL'] +OS = RbConfig::CONFIG["target_os"] +SHELL = RbConfig::CONFIG['SHELL'] class Hash::Ordered < Hash def [](key) @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.8" -#define RUBY_RELEASE_DATE "2010-11-26" +#define RUBY_RELEASE_DATE "2010-11-27" #define RUBY_VERSION_CODE 188 -#define RUBY_RELEASE_CODE 20101126 +#define RUBY_RELEASE_CODE 20101127 #define RUBY_PATCHLEVEL -1 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 8 #define RUBY_RELEASE_YEAR 2010 #define RUBY_RELEASE_MONTH 11 -#define RUBY_RELEASE_DAY 26 +#define RUBY_RELEASE_DAY 27 #define NO_STRING_LITERAL_CONCATENATION 1 #ifdef RUBY_EXTERN diff --git a/win32/resource.rb b/win32/resource.rb index 183006c0d6..06b0aca7af 100755 --- a/win32/resource.rb +++ b/win32/resource.rb @@ -2,7 +2,7 @@ require 'rbconfig' -CONFIG = Config::MAKEFILE_CONFIG +CONFIG = RbConfig::MAKEFILE_CONFIG version = %w'MAJOR MINOR TEENY'.map{|v| CONFIG[v] || '0'} patch = CONFIG['PATCHLEVEL'] |