diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-11 13:29:58 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-11 13:29:58 +0000 |
| commit | 1ebb3a2b50126fba8a54ebbf2694645894d933ec (patch) | |
| tree | ab83447ec4e4915381412c9e352ae83b8ab61fc7 | |
| parent | f895841e2c2861f8d3ea2247817d6ffd35dff71c (diff) | |
merge revision(s) 43398,43407,43408,43417: [Backport #9044]
* win32/Makefile.sub (config.h): VC 2013 supports C99 mathematics
functions. [ruby-core:57981] [Bug #9044]
* include/ruby/win32.h (rb_infinity_float): suppress overflow in
constant arithmetic warnings. [ruby-core:57981] [Bug #9044]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43648 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | include/ruby/win32.h | 14 | ||||
| -rw-r--r-- | version.h | 8 | ||||
| -rw-r--r-- | win32/Makefile.sub | 17 |
4 files changed, 44 insertions, 5 deletions
@@ -1,3 +1,13 @@ +Mon Nov 11 22:14:37 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * include/ruby/win32.h (rb_infinity_float): suppress overflow in + constant arithmetic warnings. [ruby-core:57981] [Bug #9044] + +Mon Nov 11 22:14:37 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * win32/Makefile.sub (config.h): VC 2013 supports C99 mathematics + functions. [ruby-core:57981] [Bug #9044] + Thu Oct 31 22:28:04 2013 Martin Bosslet <Martin.Bosslet@gmail.com> * test/openssl/test_pkey_ec.rb: Skip tests for "Oakley" curves as diff --git a/include/ruby/win32.h b/include/ruby/win32.h index a2eec0cf19..a190355a9c 100644 --- a/include/ruby/win32.h +++ b/include/ruby/win32.h @@ -308,6 +308,20 @@ extern FILE *rb_w32_fsopen(const char *, const char *, int); #endif #include <float.h> + +#if defined _MSC_VER && _MSC_VER >= 1800 && defined INFINITY +#pragma warning(push) +#pragma warning(disable:4756) +static inline float +rb_infinity_float(void) +{ + return INFINITY; +} +#pragma warning(pop) +#undef INFINITY +#define INFINITY rb_infinity_float() +#endif + #if !defined __MINGW32__ || defined __NO_ISOCEXT #ifndef isnan #define isnan(x) _isnan(x) @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.0.0" -#define RUBY_RELEASE_DATE "2013-10-31" -#define RUBY_PATCHLEVEL 343 +#define RUBY_RELEASE_DATE "2013-11-11" +#define RUBY_PATCHLEVEL 344 #define RUBY_RELEASE_YEAR 2013 -#define RUBY_RELEASE_MONTH 10 -#define RUBY_RELEASE_DAY 31 +#define RUBY_RELEASE_MONTH 11 +#define RUBY_RELEASE_DAY 11 #include "ruby/version.h" diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 92136a0ed3..cf3cfb3fd1 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -230,7 +230,10 @@ EXTSOLIBS = LIBS = oldnames.lib user32.lib advapi32.lib shell32.lib ws2_32.lib 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.obj +!endif !endif DLNOBJ = dln.obj @@ -617,6 +620,18 @@ $(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) >= 120 +#define HAVE_ACOSH 1 +#define HAVE_ASINH 1 +#define HAVE_ATANH 1 +#define HAVE_CBRT 1 +#define HAVE_LOG2 1 +#define log2(x) log2(x) +#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 |