diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-05-18 13:20:39 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-05-18 13:20:39 +0000 |
commit | 3360dfd294a46879757fd587836e0c897db7f330 (patch) | |
tree | a912e54bcdd2e471a0573620db7730a4d9c617cb /win32 | |
parent | 3d6ecd45c7904a18687adf151ee89c1f37ba5b9c (diff) | |
download | ruby-3360dfd294a46879757fd587836e0c897db7f330.tar.gz |
win32.c: fix infinite recursion
* win32/win32.c: include "missing/nextafter.c" and address
finite() and isnan() macros, to get rid of infinite recursion.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46004 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
-rw-r--r-- | win32/Makefile.sub | 2 | ||||
-rw-r--r-- | win32/win32.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 85dd1ef394..073b9d6544 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -237,7 +237,7 @@ LIBS = $(LIBS) imagehlp.lib shlwapi.lib $(EXTLIBS) !if !defined(MISSING) MISSING = crypt.obj ffs.obj langinfo.obj lgamma_r.obj strlcat.obj strlcpy.obj win32/win32.obj win32/file.obj setproctitle.obj !if $(RT_VER) < 120 -MISSING = $(MISSING) acosh.obj cbrt.obj erf.obj tgamma.obj nextafter.obj finite.obj isnan.obj +MISSING = $(MISSING) acosh.obj cbrt.obj erf.obj tgamma.obj !endif !endif DLNOBJ = dln.obj diff --git a/win32/win32.c b/win32/win32.c index 1ca677b8dc..4ebf5c8e76 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -7214,3 +7214,7 @@ rb_w32_pow(double x, double y) return r; } #endif + +#if RUBY_MSVCRT_VERSION < 120 +#include "missing/nextafter.c" +#endif |