summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-02 09:25:48 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-02 09:25:48 +0000
commitd6163eaaa425df6cec81404d0f69d822bfae1529 (patch)
tree348e947c39f112b04513e630119eef5d90340004
parentc22420d58f6306b8f58e016aef85dcc34b8ed57d (diff)
merge revision(s) 17644:
* math.c (domain_check): fix preprocess condition. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17803 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--math.c2
-rw-r--r--version.h2
3 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 151f8b2052a..a2a89efe5fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jul 2 18:25:17 2008 Tanaka Akira <akr@fsij.org>
+
+ * math.c (domain_check): fix preprocess condition.
+
Wed Jul 2 18:19:45 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/tmpdir.rb (@@systmpdir): prior LOCAL_APPDATA if possible, and
diff --git a/math.c b/math.c
index 60dd0b72042..cf78fc4f2a1 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 74e54493ce5..56150d68c74 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2008-07-02"
#define RUBY_VERSION_CODE 186
#define RUBY_RELEASE_CODE 20080702
-#define RUBY_PATCHLEVEL 260
+#define RUBY_PATCHLEVEL 261
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8