From a137d5381aaa3ef74434a9e19e5cfe99a07a3f5f Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sat, 7 Jun 2008 18:49: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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@16935 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 1131ae47d..6ac77b0e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun Jun 8 03:49:15 2008 Tanaka Akira + + * missing/isinf.c (isinf): don't define if the macro is defined. + Sun Jun 8 03:42:10 2008 Nobuyoshi Nakada * numeric.c (round): fallback definition. @@ -7,7 +11,7 @@ Sun Jun 8 03:42:10 2008 Nobuyoshi Nakada Sun Jun 8 03:42:10 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 e44ef6c3c..c9e49c679 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 2fed3dd88..816e859e7 100644 --- a/version.h +++ b/version.h @@ -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 -- cgit