merge revision(s) 14316:

shyouhei · shyouhei · commit a2d87271fca3 · 2008-06-07T20:55:30.000Z
* configure.in (TIMEZONE_VOID): check whether timezone requires zero
	  arguments.  [ruby-dev:32631]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17000 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jun  8 05:54:44 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (TIMEZONE_VOID): check whether timezone requires zero
+	  arguments.  [ruby-dev:32631]
+
 Sun Jun  8 05:37:10 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (f_rest_arg): check if duplicated.  [ruby-core:14140]
diff --git a/configure.in b/configure.in
@@ -595,6 +595,17 @@ RUBY_CHECK_VARTYPE(timezone, [#include <time.h>], [long int])
 RUBY_CHECK_VARTYPE(altzone, [#include <time.h>], [long int])
 if test "$rb_cv_var_timezone" = no; then
   AC_CHECK_FUNCS(timezone)
+  if test "$ ac_cv_func_timezone" = yes; then
+    AC_CACHE_CHECK([whether timezone requires zero arguments], rb_cv_func_timezone_void,
+      [AC_TRY_COMPILE([#include <time.h>],
+	[(void)timezone(0, 0);],
+	[rb_cv_func_timezone_void=no],
+	[rb_cv_func_timezone_void=yes])]
+    )
+    if test $rb_cv_func_timezone_void = yes; then
+      AC_DEFINE(TIMEZONE_VOID)
+    fi
+  fi
 fi
 
 AC_CACHE_CHECK(for negative time_t for gmtime(3), rb_cv_negative_time_t,
diff --git a/version.h b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-08"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20080608
-#define RUBY_PATCHLEVEL 161
+#define RUBY_PATCHLEVEL 162
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
