From 41c8c78f11a41c89da33adbcc4cd2e877d905a22 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sat, 7 Jun 2008 18:48:52 +0000 Subject: 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 --- ChangeLog | 6 +++++- missing/isinf.c | 7 +++++++ version.h | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d74d540990..a87573811a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun Jun 8 03:46:55 2008 Tanaka Akira + + * missing/isinf.c (isinf): don't define if the macro is defined. + Sun Jun 8 03:34:23 2008 Nobuyoshi Nakada * numeric.c (round): fallback definition. @@ -7,7 +11,7 @@ Sun Jun 8 03:34:23 2008 Nobuyoshi Nakada Sun Jun 8 03:34:23 2008 Nobuyoshi Nakada - * 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 #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 00c6e74594..ab0b6f0555 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 -- cgit v1.2.3