nobu	2013-07-08 23:13:13 +0900 (Mon, 08 Jul 2013)

  New Revision: 41836

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

  Log:
    win32.c: for strict ANSI
    
    * win32/win32.c (rb_w32_pow): move from win32.h and disable strict
      ANSI mode macro to let _controlfp() stuff defined.
      [ruby-core:55312] [Bug #8495]

  Modified files:
    trunk/ChangeLog
    trunk/include/ruby/win32.h
    trunk/win32/win32.c

Index: include/ruby/win32.h
===================================================================
--- include/ruby/win32.h	(revision 41835)
+++ include/ruby/win32.h	(revision 41836)
@@ -794,21 +794,7 @@ rb_w32_pow(double x, double y) https://github.com/ruby/ruby/blob/trunk/include/ruby/win32.h#L794
     return powl(x, y);
 }
 #elif defined(__MINGW64_VERSION_MAJOR)
-/*
- * Set floating point precision for pow() of mingw-w64 x86.
- * With default precision the result is not proper on WinXP.
- */
-static inline double
-rb_w32_pow(double x, double y)
-{
-    double r;
-    unsigned int default_control = _controlfp(0, 0);
-    _controlfp(_PC_64, _MCW_PC);
-    r = pow(x, y);
-    /* Restore setting */
-    _controlfp(default_control, _MCW_PC);
-    return r;
-}
+double rb_w32_pow(double x, double y);
 #endif
 #if defined(__MINGW64_VERSION_MAJOR) || defined(__MINGW64__)
 #define pow rb_w32_pow
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 41835)
+++ ChangeLog	(revision 41836)
@@ -1,4 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
-Mon Jul  8 23:12:48 2013  Nobuyoshi Nakada  <nobu@r...>
+Mon Jul  8 23:13:11 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* win32/win32.c (rb_w32_pow): move from win32.h and disable strict
+	  ANSI mode macro to let _controlfp() stuff defined.
+	  [ruby-core:55312] [Bug #8495]
 
 	* numeric.c (finite): add declaration for strict ANSI.
 	  [ruby-core:55312] [Bug #8495]
Index: win32/win32.c
===================================================================
--- win32/win32.c	(revision 41835)
+++ win32/win32.c	(revision 41836)
@@ -19,6 +19,8 @@ https://github.com/ruby/ruby/blob/trunk/win32/win32.c#L19
   Copyright (C) 2000  Information-technology Promotion Agency, Japan
  */
 
+#undef __STRICT_ANSI__
+
 #include "ruby/ruby.h"
 #include "ruby/encoding.h"
 #include <fcntl.h>
@@ -6954,3 +6956,21 @@ rb_w32_unwrap_io_handle(int fd) https://github.com/ruby/ruby/blob/trunk/win32/win32.c#L6956
     }
     return _close(fd);
 }
+
+#if !defined(__MINGW64__) && defined(__MINGW64_VERSION_MAJOR)
+/*
+ * Set floating point precision for pow() of mingw-w64 x86.
+ * With default precision the result is not proper on WinXP.
+ */
+double
+rb_w32_pow(double x, double y)
+{
+    double r;
+    unsigned int default_control = _controlfp(0, 0);
+    _controlfp(_PC_64, _MCW_PC);
+    r = pow(x, y);
+    /* Restore setting */
+    _controlfp(default_control, _MCW_PC);
+    return r;
+}
+#endif

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