* math.c (math_log): nan takes a dummy argument on Cygwin 1.5.0. backport from

  1.8.  Thu Jul 10 14:42:02 2003  WATANABE Hirofumi  <eban@ruby-lang.org>


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@4296 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 16 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index fa63339d79..4cd1b7a69e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Aug  3 15:56:27 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+	* math.c (math_log): nan takes a dummy argument on Cygwin 1.5.0.
+	  backport from 1.8.
+	  Thu Jul 10 14:42:02 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
 Sun Jul 27 03:10:31 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
 	* io.c (io_reopen): avoid dup2() equal handles not to close itself and
diff --git a/math.c b/math.c
index 86c889dca9..3112b0da79 100644
--- a/math.c
+++ b/math.c
@@ -98,8 +98,12 @@ math_exp(obj, x)
 }
 
 #if defined __CYGWIN__
-#define log(x) ((x) < 0.0 ? nan() : log(x))
-#define log10(x) ((x) < 0.0 ? nan() : log10(x))
+# include <cygwin/version.h>
+# if CYGWIN_VERSION_DLL_MAJOR < 1005
+#  define nan(x) nan()
+# endif
+# define log(x) ((x) < 0.0 ? nan("") : log(x))
+# define log10(x) ((x) < 0.0 ? nan("") : log10(x))
 #endif
 
 static VALUE
diff --git a/version.h b/version.h
index 79ed000cfc..e469bf423b 100644
--- a/version.h
+++ b/version.h
@@ -1,11 +1,11 @@
 #define RUBY_VERSION "1.6.8"
-#define RUBY_RELEASE_DATE "2003-07-27"
+#define RUBY_RELEASE_DATE "2003-08-03"
 #define RUBY_VERSION_CODE 168
-#define RUBY_RELEASE_CODE 20030727
+#define RUBY_RELEASE_CODE 20030803
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 6
 #define RUBY_VERSION_TEENY 8
 #define RUBY_RELEASE_YEAR 2003
-#define RUBY_RELEASE_MONTH 7
-#define RUBY_RELEASE_DAY 27
+#define RUBY_RELEASE_MONTH 8
+#define RUBY_RELEASE_DAY 3