diff options
| -rw-r--r-- | configure.in | 27 | ||||
| -rw-r--r-- | include/ruby/win32.h | 18 |
2 files changed, 36 insertions, 9 deletions
diff --git a/configure.in b/configure.in index 92a6cc6120..9eec2e9fa2 100644 --- a/configure.in +++ b/configure.in @@ -940,6 +940,33 @@ if test "$GCC" = yes; then # various headers. Most frequent situation is the use of // # comments. We bypass ANSI C mode for them. Otherwise # extension libs cannot include those headers. + + # Since math.h in some mingw64 wrongly delcares frexp and modf + # to be pure, the variables pointed by the second arguments are + # considered uninitialized unexpectedly. + AC_CACHE_CHECK([whether frexp and modf are broken], + rb_cv_mingw64_broken_frexp_modf, + [ + save_CFLAGS="$CFLAGS" + if test "$particular_werror_flags" = "yes"; then + CFLAGS="$CFLAGS -Werror=uninitialized" + else + CFLAGS="$CFLAGS -Werror -Wuninitialized" + fi + AC_TRY_COMPILE([@%:@include <math.h> + int foo(double x) + { + int exp; + frexp(x, &exp); + return exp; + }], [if (foo(0.0)) return 1;], + [rb_cv_mingw64_broken_frexp_modf=no], + [rb_cv_mingw64_broken_frexp_modf=yes]) + CFLAGS="$save_CFLAGS" + ]) + if test "$rb_cv_mingw64_broken_frexp_modf" = yes; then + AC_DEFINE(RUBY_MINGW64_BROKEN_FREXP_MODF) + fi ], [cygwin*|darwin*|netbsd*|nacl], [ # need lgamma_r(), finite() diff --git a/include/ruby/win32.h b/include/ruby/win32.h index a7c9db81cd..ca99ee48f3 100644 --- a/include/ruby/win32.h +++ b/include/ruby/win32.h @@ -753,7 +753,8 @@ uintptr_t rb_w32_asynchronize(asynchronous_func_t func, uintptr_t self, int argc RUBY_SYMBOL_EXPORT_END -#ifdef __MINGW_ATTRIB_PURE +#if (defined(__MINGW64_VERSION_MAJOR) || defined(__MINGW64__)) && !defined(__cplusplus) +#ifdef RUBY_MINGW64_BROKEN_FREXP_MODF /* License: Ruby's */ /* get rid of bugs in math.h of mingw */ #define frexp(_X, _Y) __extension__ ({\ @@ -771,13 +772,6 @@ RUBY_SYMBOL_EXPORT_END }) #endif -#if defined(__cplusplus) -#if 0 -{ /* satisfy cc-mode */ -#endif -} /* extern "C" { */ -#endif - #if defined(__MINGW64__) /* * Use powl() instead of broken pow() of x86_64-w64-mingw32. @@ -792,8 +786,14 @@ rb_w32_pow(double x, double y) #elif defined(__MINGW64_VERSION_MAJOR) double rb_w32_pow(double x, double y); #endif -#if defined(__MINGW64_VERSION_MAJOR) || defined(__MINGW64__) #define pow rb_w32_pow #endif +#if defined(__cplusplus) +#if 0 +{ /* satisfy cc-mode */ +#endif +} /* extern "C" { */ +#endif + #endif /* RUBY_WIN32_H */ |