naruse	2012-07-04 19:36:28 +0900 (Wed, 04 Jul 2012)

  New Revision: 36307

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

  Log:
    merge revision(s) 36281:
    
    * ext/dl/cfunc.c (rb_dlcfunc_call): also needed the workaround for VC8
      for x64.  [ruby-dev:45875] [Bug #6676]
      reported by aves_ramphastos (Seigo Ishigane)

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/ext/dl/cfunc.c
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 36306)
+++ ruby_1_9_3/ChangeLog	(revision 36307)
@@ -1,3 +1,9 @@
+Wed Jul  4 19:36:17 2012  NAKAMURA Usaku  <usa@r...>
+
+	* ext/dl/cfunc.c (rb_dlcfunc_call): also needed the workaround for VC8
+	  for x64.  [ruby-dev:45875] [Bug #6676]
+	  reported by aves_ramphastos (Seigo Ishigane)
+
 Tue Jul  3 19:37:52 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* file.c (rmext): no extension to strip if empty string.
Index: ruby_1_9_3/ext/dl/cfunc.c
===================================================================
--- ruby_1_9_3/ext/dl/cfunc.c	(revision 36306)
+++ ruby_1_9_3/ext/dl/cfunc.c	(revision 36307)
@@ -324,7 +324,7 @@
 }
 
 
-#if defined(_MSC_VER) && defined(_M_AMD64) && _MSC_VER == 1500
+#if defined(_MSC_VER) && defined(_M_AMD64) && _MSC_VER >= 1400 && _MSC_VER < 1600
 # pragma optimize("", off)
 #endif
 /*
@@ -594,7 +594,7 @@
 
     return result;
 }
-#if defined(_MSC_VER) && defined(_M_AMD64) && _MSC_VER == 1500
+#if defined(_MSC_VER) && defined(_M_AMD64) && _MSC_VER >= 1400 && _MSC_VER < 1600
 # pragma optimize("", on)
 #endif
 
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 36306)
+++ ruby_1_9_3/version.h	(revision 36307)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 252
+#define RUBY_PATCHLEVEL 253
 
 #define RUBY_RELEASE_DATE "2012-07-04"
 #define RUBY_RELEASE_YEAR 2012

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