yugui	2010-10-02 20:20:06 +0900 (Sat, 02 Oct 2010)

  New Revision: 29390

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

  Log:
    merges r29091 from trunk into ruby_1_9_2.
    --
    * ext/dl/cfunc.c (rb_dlcfunc_call): workaround for VC9 for x64.
      reported by kuwamoto shintaro in [ruby-dev:42125].

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

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 29389)
+++ ruby_1_9_2/ChangeLog	(revision 29390)
@@ -1,3 +1,8 @@
+Wed Aug 25 03:42:43 2010  NAKAMURA Usaku  <usa@r...>
+
+	* ext/dl/cfunc.c (rb_dlcfunc_call): workaround for VC9 for x64.
+	  reported by kuwamoto shintaro in [ruby-dev:42125].
+
 Mon Aug 23 13:09:27 2010  NAKAMURA, Hiroshi  <nahi@r...>
 
 	* backport r29071 from ruby_1_8;
Index: ruby_1_9_2/ext/dl/cfunc.c
===================================================================
--- ruby_1_9_2/ext/dl/cfunc.c	(revision 29389)
+++ ruby_1_9_2/ext/dl/cfunc.c	(revision 29390)
@@ -316,6 +316,9 @@
 }
 
 
+#if defined(_MSC_VER) && defined(_M_AMD64) && _MSC_VER == 1500
+# pragma optimize("", off)
+#endif
 /*
  * call-seq:
  *    dlcfunc.call(ary)   => some_value
@@ -581,6 +584,9 @@
 
     return result;
 }
+#if defined(_MSC_VER) && defined(_M_AMD64) && _MSC_VER == 1500
+# pragma optimize("", on)
+#endif
 
 /*
  * call-seq:
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 29389)
+++ ruby_1_9_2/version.h	(revision 29390)
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.2"
 #define RUBY_RELEASE_DATE "2010-10-02"
-#define RUBY_PATCHLEVEL 10
+#define RUBY_PATCHLEVEL 11
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9

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