summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/win32ole/test_win32ole_method.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a4db427..e3f6bc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun 29 19:39:59 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+ * test/win32ole/test_win32ole_method.rb (is_ruby64): check
+ ruby binary is mswin64 or mingw64. [ruby-dev:41756]
+
Tue Jun 29 14:18:21 2010 NAKAMURA Usaku <usa@ruby-lang.org>
* file.c (rb_realpath_internal, realpath_rec): skip UNC share root
diff --git a/test/win32ole/test_win32ole_method.rb b/test/win32ole/test_win32ole_method.rb
index 87d7a81..e4f38ea 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?
- /win64/ =~ RUBY_PLATFORM
+ /mswin64|mingw64/ =~ RUBY_PLATFORM
end
def test_offset_vtbl