diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-07 18:49:52 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-07 18:49:52 +0000 |
commit | 98d6f01de3969ecd0bdc6458e7fb2475e581e6f9 (patch) | |
tree | d7756a83c6613534933969bd01e12396f4c09ab2 | |
parent | 198898b3d56fdfc3da69e5e5b109f5d91019bf86 (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_6@16935 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | missing/isinf.c | 7 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 13 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Sun Jun 8 03:49:15 2008 Tanaka Akira <akr@fsij.org> + + * missing/isinf.c (isinf): don't define if the macro is defined. + Sun Jun 8 03:42:10 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * numeric.c (round): fallback definition. @@ -7,7 +11,7 @@ Sun Jun 8 03:42:10 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> Sun Jun 8 03:42:10 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 e44ef6c3c1..c9e49c6795 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 @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-08" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20080608 -#define RUBY_PATCHLEVEL 144 +#define RUBY_PATCHLEVEL 145 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |