kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 57762: [Backport #13267]

Browse source 
broken mingw

	* configure.in: check whether frexp and modf are broken.

	* include/ruby/win32.h (frexp, modf): ignore bad declarations when
	  compiling as C++.  [ruby-core:79859] [Bug #13267]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@58182 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2017-03-27 17:11:48 +00:00
parent 06103f2c1a
commit ff6e8710ee
3 changed files with 37 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

27
configure.in
View file

@ -894,6 +894,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()

18
include/ruby/win32.h
View file

@ -752,7 +752,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__ ({\
@ -770,13 +771,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.
@ -791,8 +785,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 */

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.3"
#define RUBY_RELEASE_DATE "2017-03-28"
#define RUBY_PATCHLEVEL 291
#define RUBY_PATCHLEVEL 292
#define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 3