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_6@17803 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 151f8b205..a2a89efe5 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 60dd0b720..cf78fc4f2 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 74e54493c..56150d68c 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