usa	2014-01-29 14:15:30 +0900 (Wed, 29 Jan 2014)

  New Revision: 44743

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

  Log:
    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]

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/include/ruby/win32.h
    branches/ruby_1_9_3/version.h
    branches/ruby_1_9_3/win32/Makefile.sub
Index: ruby_1_9_3/include/ruby/win32.h
===================================================================
--- ruby_1_9_3/include/ruby/win32.h	(revision 44742)
+++ ruby_1_9_3/include/ruby/win32.h	(revision 44743)
@@ -315,6 +315,20 @@ extern FILE *rb_w32_fsopen(const char *, https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/include/ruby/win32.h#L315
 #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)
Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 44742)
+++ ruby_1_9_3/ChangeLog	(revision 44743)
@@ -1,3 +1,13 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1
+Wed Jan 29 14:08:54 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* include/ruby/win32.h (rb_infinity_float): suppress overflow in
+	  constant arithmetic warnings.  [ruby-core:57981] [Bug #9044]
+
+Wed Jan 29 14:08:54 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* win32/Makefile.sub (config.h): VC 2013 supports C99 mathematics
+	  functions.  [ruby-core:57981] [Bug #9044]
+
 Wed Jan 29 14:00:15 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* compar.c (cmp_eq): fail if recursion.  [ruby-core:57736] [Bug #9003]
Index: ruby_1_9_3/win32/Makefile.sub
===================================================================
--- ruby_1_9_3/win32/Makefile.sub	(revision 44742)
+++ ruby_1_9_3/win32/Makefile.sub	(revision 44743)
@@ -229,7 +229,10 @@ LIBS = oldnames.lib user32.lib advapi32. https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/win32/Makefile.sub#L229
 LIBS = unicows.lib $(LIBS)
 !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
 
 ARFLAGS = -machine:$(MACHINE) -out:
@@ -597,6 +600,18 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/win32/Makefile.sub#L600
 #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
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 44742)
+++ ruby_1_9_3/version.h	(revision 44743)
@@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 497
+#define RUBY_PATCHLEVEL 498
 
 #define RUBY_RELEASE_DATE "2014-01-29"
 #define RUBY_RELEASE_YEAR 2014

Property changes on: ruby_1_9_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r43398,43407-43408,43417


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