shyouhei	2008-06-08 03:48:52 +0900 (Sun, 08 Jun 2008)

  New Revision: 16933

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/missing/isinf.c
    branches/ruby_1_8_5/version.h

  Log:
    merge revision(s) 13914:13917:
    * missing/isinf.c (isinf): don't define if the macro is defined.
    * numeric.c (flodivmod): work around for infinity.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=16933&r2=16932&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/missing/isinf.c?r1=16933&r2=16932&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=16933&r2=16932&diff_format=u

Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 16932)
+++ ruby_1_8_5/ChangeLog	(revision 16933)
@@ -1,3 +1,7 @@
+Sun Jun  8 03:46:55 2008  Tanaka Akira  <akr@f...>
+
+	* missing/isinf.c (isinf): don't define if the macro is defined.
+
 Sun Jun  8 03:34:23 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* numeric.c (round): fallback definition.
@@ -7,7 +11,7 @@
 
 Sun Jun  8 03:34:23 2008  Nobuyoshi Nakada  <nobu@r...>
 
-	* numeric.c (flodivmod): work around for inifinity.
+	* numeric.c (flodivmod): work around for infinity.
 
 	* numeric.c (flo_divmod): work around for platforms have no round().
 	  [ruby-dev:32247]
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 16932)
+++ ruby_1_8_5/version.h	(revision 16933)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-08"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080608
-#define RUBY_PATCHLEVEL 145
+#define RUBY_PATCHLEVEL 146
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_5/missing/isinf.c
===================================================================
--- ruby_1_8_5/missing/isinf.c	(revision 16932)
+++ ruby_1_8_5/missing/isinf.c	(revision 16933)
@@ -28,12 +28,19 @@
 #include <ieeefp.h>
 #endif
 
+/* 
+ * isinf may be provided only as a macro.
+ * ex. HP-UX, Solaris 10
+ * http://www.gnu.org/software/automake/manual/autoconf/Function-Portability.html
+ */
+#ifndef isinf
 int
 isinf(n)
     double n;
 {
     return (!finite(n) && !isnan(n));
 }
+#endif
 
 #else
 

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