diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | include/ruby/win32.h | 16 | ||||
| -rw-r--r-- | win32/win32.c | 20 |
3 files changed, 26 insertions, 16 deletions
@@ -1,4 +1,8 @@ -Mon Jul 8 23:12:48 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> +Mon Jul 8 23:13:11 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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] diff --git a/include/ruby/win32.h b/include/ruby/win32.h index efb9c8d551..809784d1c8 100644 --- a/include/ruby/win32.h +++ b/include/ruby/win32.h @@ -794,21 +794,7 @@ rb_w32_pow(double x, double y) 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 diff --git a/win32/win32.c b/win32/win32.c index c7ee9844b1..ca834c9f5a 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -19,6 +19,8 @@ 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) } 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 |