naruse	2012-09-24 10:39:14 +0900 (Mon, 24 Sep 2012)

  New Revision: 37022

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37022

  Log:
    merge revision(s) 36508: [Backport #7015]
    
    * 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]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/test/win32ole/test_win32ole_method.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 37021)
+++ ruby_1_9_3/ChangeLog	(revision 37022)
@@ -1,3 +1,9 @@
+Mon Sep 24 10:38:55 2012  Luis Lavena  <luislavena@g...>
+
+	* 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@r...>
 
 	* lib/test/unit/parallel.rb: workaround fix for rubygems.
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 37021)
+++ ruby_1_9_3/version.h	(revision 37022)
@@ -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
Index: ruby_1_9_3/test/win32ole/test_win32ole_method.rb
===================================================================
--- ruby_1_9_3/test/win32ole/test_win32ole_method.rb	(revision 37021)
+++ ruby_1_9_3/test/win32ole/test_win32ole_method.rb	(revision 37022)
@@ -109,7 +109,7 @@
     end
 
     def is_ruby64?
-      /mswin64|mingw64/ =~ RUBY_PLATFORM
+      /mswin64|x64-mingw/ =~ RUBY_PLATFORM
     end
 
     def test_offset_vtbl

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/