summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-07 18:48:52 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-07 18:48:52 +0000
commit41c8c78f11a41c89da33adbcc4cd2e877d905a22 (patch)
treeb665be2d9d0df1e1147dd7e6360c0815f2c14c7d
parent38356317f6707447fba8c0423edd3217ab971a0c (diff)
merge revision(s) 13914:13917:
* missing/isinf.c (isinf): don't define if the macro is defined. * numeric.c (flodivmod): work around for infinity. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@16933 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--missing/isinf.c7
-rw-r--r--version.h2
3 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d74d5409903..a87573811ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Jun 8 03:46:55 2008 Tanaka Akira <akr@fsij.org>
+
+ * missing/isinf.c (isinf): don't define if the macro is defined.
+
Sun Jun 8 03:34:23 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* numeric.c (round): fallback definition.
@@ -7,7 +11,7 @@ Sun Jun 8 03:34:23 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
Sun Jun 8 03:34:23 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * 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]
diff --git a/missing/isinf.c b/missing/isinf.c
index e44ef6c3c16..c9e49c67955 100644
--- a/missing/isinf.c
+++ b/missing/isinf.c
@@ -28,12 +28,19 @@ isinf(n)
#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
diff --git a/version.h b/version.h
index 00c6e745948..ab0b6f0555c 100644
--- a/version.h
+++ b/version.h
@@ -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