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 /include | |
| 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
Diffstat (limited to 'include')
| -rw-r--r-- | include/ruby/win32.h | 14 |
1 files changed, 14 insertions, 0 deletions
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) |