yugui	2011-05-30 07:50:03 +0900 (Mon, 30 May 2011)

  New Revision: 31802

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

  Log:
    merges r31278 from trunk into ruby_1_9_2.
    --
    * include/ruby/win32.h (frexp, modf): wrongly declared as pure in
      mingw math.h.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/include/ruby/win32.h
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/include/ruby/win32.h
===================================================================
--- ruby_1_9_2/include/ruby/win32.h	(revision 31801)
+++ ruby_1_9_2/include/ruby/win32.h	(revision 31802)
@@ -674,6 +674,20 @@
 typedef uintptr_t (*asynchronous_func_t)(uintptr_t self, int argc, uintptr_t* argv);
 uintptr_t rb_w32_asynchronize(asynchronous_func_t func, uintptr_t self, int argc, uintptr_t* argv, uintptr_t intrval);
 
+#ifdef __MINGW_ATTRIB_PURE
+/* get rid of bugs in math.h of mingw */
+#define frexp(_X, _Y) __extension__ ({\
+    int *intptr_frexp_bug = (_Y);\
+    *intptr_frexp_bug = *intptr_frexp_bug;\
+    frexp((_X), intptr_frexp_bug);\
+})
+#define modf(_X, _Y) __extension__ ({\
+    double *intptr_modf_bug = (_Y);\
+    *intptr_modf_bug = *intptr_modf_bug;\
+    modf((_X), intptr_modf_bug);\
+})
+#endif
+
 #if defined(__cplusplus)
 #if 0
 { /* satisfy cc-mode */
Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 31801)
+++ ruby_1_9_2/ChangeLog	(revision 31802)
@@ -1,3 +1,8 @@
+Thu Apr 14 21:21:06 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* include/ruby/win32.h (frexp, modf): wrongly declared as pure in
+	  mingw math.h.
+
 Thu Apr 14 21:21:01 2011  Nobuyoshi Nakada  <nobu@r...>
 
 	* include/ruby/win32.h (ftruncate, truncate): mingw64 misses
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 31801)
+++ ruby_1_9_2/version.h	(revision 31802)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 229
+#define RUBY_PATCHLEVEL 230
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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