summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--test/win32ole/test_win32ole_method.rb2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4ae1e1d129..9f92722194 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Jul 24 08:09:30 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]
+
Tue Jul 24 07:22:58 2012 Eric Hodel <drbrain@segment7.net>
* time.c (time_sec): Updated description of leap seconds for accuracy.
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