ruby-changes:5496
From: shyouhei <ko1@a...>
Date: Sun, 8 Jun 2008 05:54:38 +0900 (JST)
Subject: [ruby-changes:5496] Ruby:r16998 (ruby_1_8_5): merge revision(s) 14316:
shyouhei 2008-06-08 05:54:23 +0900 (Sun, 08 Jun 2008) New Revision: 16998 Modified files: branches/ruby_1_8_5/ChangeLog branches/ruby_1_8_5/configure.in branches/ruby_1_8_5/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_5/configure.in?r1=16998&r2=16997&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=16998&r2=16997&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=16998&r2=16997&diff_format=u Index: ruby_1_8_5/configure.in =================================================================== --- ruby_1_8_5/configure.in (revision 16997) +++ ruby_1_8_5/configure.in (revision 16998) @@ -542,6 +542,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_5/ChangeLog =================================================================== --- ruby_1_8_5/ChangeLog (revision 16997) +++ ruby_1_8_5/ChangeLog (revision 16998) @@ -1,3 +1,8 @@ +Sun Jun 8 05:53:46 2008 Nobuyoshi Nakada <nobu@r...> + + * configure.in (TIMEZONE_VOID): check whether timezone requires zero + arguments. [ruby-dev:32631] + Sun Jun 8 05:35:32 2008 Nobuyoshi Nakada <nobu@r...> * parse.y (f_rest_arg): check if duplicated. [ruby-core:14140] Index: ruby_1_8_5/version.h =================================================================== --- ruby_1_8_5/version.h (revision 16997) +++ ruby_1_8_5/version.h (revision 16998) @@ -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 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/