From 308856d175b962b27122959adbaf9bb27121e3fa Mon Sep 17 00:00:00 2001 From: shyouhei Date: Wed, 2 Jul 2008 09:26:29 +0000 Subject: [PATCH] merge revision(s) 17644: * math.c (domain_check): fix preprocess condition. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_7@17805 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ math.c | 2 +- version.h | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 01dd67eba..61f60ee06 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Jul 2 18:26:20 2008 Tanaka Akira + + * math.c (domain_check): fix preprocess condition. + Wed Jul 2 18:22:52 2008 Nobuyoshi Nakada * lib/tmpdir.rb (@@systmpdir): prior LOCAL_APPDATA if possible, and diff --git a/math.c b/math.c index 813e38c7e..bf9b59815 100644 --- a/math.c +++ b/math.c @@ -34,7 +34,7 @@ domain_check(x, msg) if (isnan(x)) { #if defined(EDOM) errno = EDOM; -#elif define(ERANGE) +#elif defined(ERANGE) errno = ERANGE; #endif continue; diff --git a/version.h b/version.h index f3cb6ca7a..48a13938d 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-07-02" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20080702 -#define RUBY_PATCHLEVEL 42 +#define RUBY_PATCHLEVEL 43 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8