yugui	2010-01-30 21:51:24 +0900 (Sat, 30 Jan 2010)

  New Revision: 26497

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

  Log:
    merges r25408 from trunk into ruby_1_9_1.
    --
    * include/ruby/win32.h (finite, scalb): inline'ed non-standard
      identifier macros.  [ruby-core:2234]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/include/ruby/win32.h
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/include/ruby/win32.h
===================================================================
--- ruby_1_9_1/include/ruby/win32.h	(revision 26496)
+++ ruby_1_9_1/include/ruby/win32.h	(revision 26497)
@@ -161,14 +161,14 @@
 #define fdopen(h, m)		rb_w32_fdopen(h, m)
 #undef fsopen
 #define fsopen(p, m, sh)	rb_w32_fsopen(p, m, sh)
-#endif
+#endif /* __BORLANDC__ */
 
 #undef execv
 #define execv(path,argv)	rb_w32_aspawn(P_OVERLAY,path,argv)
 #if !defined(__BORLANDC__)
 #undef isatty
 #define isatty(h)		rb_w32_isatty(h)
-#endif
+#endif /* __BORLANDC__ */
 
 #undef mkdir
 #define mkdir(p, m)		rb_w32_mkdir(p, m)
@@ -176,7 +176,7 @@
 #define rmdir(p)		rb_w32_rmdir(p)
 #undef unlink
 #define unlink(p)		rb_w32_unlink(p)
-#endif
+#endif /* RUBY_EXPORT */
 
 #if SIZEOF_OFF_T == 8
 #define off_t __int64
@@ -282,16 +282,20 @@
 #ifndef isnan
 #define isnan(x) _isnan(x)
 #endif
-#ifndef finite
-#define finite(x) _finite(x)
-#endif
+static inline int
+finite(double x)
+{
+    return _finite(x);
+}
 #ifndef copysign
 #define copysign(a, b) _copysign(a, b)
 #endif
-#ifndef scalb
-#define scalb(a, b) _scalb(a, b)
+static inline double
+scalb(double a, long b)
+{
+    return _scalb(a, b);
+}
 #endif
-#endif
 
 #if !defined S_IFIFO && defined _S_IFIFO
 #define S_IFIFO _S_IFIFO
Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 26496)
+++ ruby_1_9_1/ChangeLog	(revision 26497)
@@ -1,3 +1,8 @@
+Tue Oct 20 16:41:18 2009  NAKAMURA Usaku  <usa@r...>
+
+	* include/ruby/win32.h (finite, scalb): inline'ed non-standard
+	  identifier macros.  [ruby-core:2234]
+
 Tue Oct 20 15:38:02 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* parse.y (ripper_intern): enable literal optimization.
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 26496)
+++ ruby_1_9_1/version.h	(revision 26497)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 402
+#define RUBY_PATCHLEVEL 403
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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