From cf4fa0f0454058a2948d0ca517c6dce55e826043 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sat, 7 Jun 2008 20:54:23 +0000 Subject: merge revision(s) 14316: * 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_5@16998 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ configure.in | 11 +++++++++++ version.h | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 66d83e084c..74076e0779 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jun 8 05:53:46 2008 Nobuyoshi Nakada + + * configure.in (TIMEZONE_VOID): check whether timezone requires zero + arguments. [ruby-dev:32631] + Sun Jun 8 05:35:32 2008 Nobuyoshi Nakada * parse.y (f_rest_arg): check if duplicated. [ruby-core:14140] diff --git a/configure.in b/configure.in index edce533c76..4a3c5e79c4 100644 --- a/configure.in +++ b/configure.in @@ -542,6 +542,17 @@ RUBY_CHECK_VARTYPE(timezone, [#include ], [long int]) RUBY_CHECK_VARTYPE(altzone, [#include ], [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 ], + [(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 index 0c51f3bf78..aede637144 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-08" #define RUBY_VERSION_CODE 185 #define RUBY_RELEASE_CODE 20080608 -#define RUBY_PATCHLEVEL 161 +#define RUBY_PATCHLEVEL 162 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3