shyouhei	2008-06-08 05:55:30 +0900 (Sun, 08 Jun 2008)

  New Revision: 17000

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/configure.in
    branches/ruby_1_8_6/version.h

  Log:
    merge revision(s) 14316:
    * configure.in (TIMEZONE_VOID): check whether timezone requires zero
      arguments.  [ruby-dev:32631]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ChangeLog?r1=17000&r2=16999&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/version.h?r1=17000&r2=16999&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/configure.in?r1=17000&r2=16999&diff_format=u

Index: ruby_1_8_6/configure.in
===================================================================
--- ruby_1_8_6/configure.in	(revision 16999)
+++ ruby_1_8_6/configure.in	(revision 17000)
@@ -595,6 +595,17 @@
 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,
Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 16999)
+++ ruby_1_8_6/ChangeLog	(revision 17000)
@@ -1,3 +1,8 @@
+Sun Jun  8 05:54:44 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (TIMEZONE_VOID): check whether timezone requires zero
+	  arguments.  [ruby-dev:32631]
+
 Sun Jun  8 05:37:10 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* parse.y (f_rest_arg): check if duplicated.  [ruby-core:14140]
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 16999)
+++ ruby_1_8_6/version.h	(revision 17000)
@@ -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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/