diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | test/win32ole/test_win32ole_method.rb | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Mon Sep 24 10:38:55 2012 Luis Lavena <luislavena@gmail.com> + + * test/win32ole/test_win32ole_method.rb (is_ruby64?): Correct platform + used to identify mingw-w64 (x64-mingw32). Patch by Hiroshi Shirosaki. + [ruby-core:46651][Bug #6782] + Mon Sep 24 10:37:56 2012 NARUSE, Yui <naruse@ruby-lang.org> * lib/test/unit/parallel.rb: workaround fix for rubygems. diff --git a/test/win32ole/test_win32ole_method.rb b/test/win32ole/test_win32ole_method.rb index e4f38eac61..2c24004682 100644 --- a/test/win32ole/test_win32ole_method.rb +++ b/test/win32ole/test_win32ole_method.rb @@ -109,7 +109,7 @@ if defined?(WIN32OLE_METHOD) end def is_ruby64? - /mswin64|mingw64/ =~ RUBY_PLATFORM + /mswin64|x64-mingw/ =~ RUBY_PLATFORM end def test_offset_vtbl @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 274 +#define RUBY_PATCHLEVEL 275 #define RUBY_RELEASE_DATE "2012-09-24" #define RUBY_RELEASE_YEAR 2012 |