diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | win32/Makefile.sub | 16 |
2 files changed, 20 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Wed Oct 23 22:51:03 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * win32/Makefile.sub (config.h): VC 2013 supports C99 mathematics + functions. [ruby-core:57981] [Bug #9044] + Wed Oct 23 19:13:18 2013 Koichi Sasada <ko1@atdot.net> * gc.c: move increment from heap to heap_pages. diff --git a/win32/Makefile.sub b/win32/Makefile.sub index ee763402b8..27ef4bc39c 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -235,7 +235,10 @@ LIBS = $(LIBS) iphlpapi.lib LIBS = $(LIBS) imagehlp.lib shlwapi.lib $(EXTLIBS) !endif !if !defined(MISSING) -MISSING = acosh.obj cbrt.obj crypt.obj erf.obj ffs.obj langinfo.obj lgamma_r.obj strlcat.obj strlcpy.obj tgamma.obj win32/win32.obj win32/file.obj setproctitle.obj +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 +!endif !endif DLNOBJ = dln.obj @@ -633,6 +636,17 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub #define GETGROUPS_T int #define RETSIGTYPE void #define TYPEOF_TIMEVAL_TV_SEC long +!if $(RT_VER) >= 1200 +#define HAVE_ACOSH 1 +#define HAVE_ASINH 1 +#define HAVE_ATANH 1 +#define HAVE_CBRT 1 +#define HAVE_LOG2 1 +#define HAVE_ERF 1 +#define HAVE_ERFC 1 +#define HAVE_ROUND 1 +#define HAVE_TGAMMA 1 +!endif #define HAVE_ALLOCA 1 #define HAVE_DUP2 1 #define HAVE_MEMCMP 1 |