[前][次][番号順一覧][スレッド一覧]

ruby-changes:33923

From: nobu <ko1@a...>
Date: Sun, 18 May 2014 22:20:48 +0900 (JST)
Subject: [ruby-changes:33923] nobu:r46004 (trunk): win32.c: fix infinite recursion

nobu	2014-05-18 22:20:39 +0900 (Sun, 18 May 2014)

  New Revision: 46004

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

  Log:
    win32.c: fix infinite recursion
    
    * win32/win32.c: include "missing/nextafter.c" and address
      finite() and isnan() macros, to get rid of infinite recursion.

  Modified files:
    trunk/win32/Makefile.sub
    trunk/win32/win32.c
Index: win32/win32.c
===================================================================
--- win32/win32.c	(revision 46003)
+++ win32/win32.c	(revision 46004)
@@ -7214,3 +7214,7 @@ rb_w32_pow(double x, double y) https://github.com/ruby/ruby/blob/trunk/win32/win32.c#L7214
     return r;
 }
 #endif
+
+#if RUBY_MSVCRT_VERSION < 120
+#include "missing/nextafter.c"
+#endif
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 46003)
+++ win32/Makefile.sub	(revision 46004)
@@ -237,7 +237,7 @@ LIBS = $(LIBS) imagehlp.lib shlwapi.lib https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L237
 !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

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

[前][次][番号順一覧][スレッド一覧]