summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-06-24 01:58:12 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-06-24 01:58:12 +0000
commitd37247c79c094e5c1c5b86892cd0ca1c15aa6483 (patch)
tree716f9ebbacec43b35715c7b52b30a0ea731f2464
parent6fa8e6d6e97146b75cf9a9a309110c96a287a629 (diff)
merges r28280 from trunk into ruby_1_9_2.
-- * include/ruby/missing.h (isnan): fix compilation error on OpenBSD. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28415 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--include/ruby/missing.h4
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ba9f237d9b..d3fd73b696 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jun 11 22:59:31 2010 Tanaka Akira <akr@fsij.org>
+
+ * include/ruby/missing.h (isnan): fix compilation error on OpenBSD.
+
Thu Jun 24 05:44:27 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* marshal.c (struct dump_arg, struct load_arg): merge taint and
diff --git a/include/ruby/missing.h b/include/ruby/missing.h
index 883971cb25..e3333c77dd 100644
--- a/include/ruby/missing.h
+++ b/include/ruby/missing.h
@@ -112,8 +112,10 @@ RUBY_EXTERN int isinf(double);
# endif
#endif
-#ifndef HAVE_ISNAN
+#ifndef isnan
+# ifndef HAVE_ISNAN
RUBY_EXTERN int isnan(double);
+# endif
#endif
/*