naruse	2010-06-13 01:41:04 +0900 (Sun, 13 Jun 2010)

  New Revision: 28306

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28306

  Log:
    merge revision(s) 28305:
    
    * time.c (rb_localtime_r2): fix mixed declarations and code.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/time.c

Index: ruby_1_9_2/time.c
===================================================================
--- ruby_1_9_2/time.c	(revision 28305)
+++ ruby_1_9_2/time.c	(revision 28306)
@@ -873,10 +873,11 @@
         int gmtoff1 = 0;
         int gmtoff2 = 0;
         struct tm tmp = *result;
+        time_t t2;
 #  if defined(HAVE_STRUCT_TM_TM_GMTOFF)
         gmtoff1 = result->tm_gmtoff;
 #  endif
-        time_t t2 = mktime(&tmp);
+        t2 = mktime(&tmp);
 #  if defined(HAVE_STRUCT_TM_TM_GMTOFF)
         gmtoff2 = tmp.tm_gmtoff;
 #  endif
Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 28305)
+++ ruby_1_9_2/ChangeLog	(revision 28306)
@@ -1,3 +1,7 @@
+Sun Jun 13 01:40:52 2010  NARUSE, Yui  <naruse@r...>
+
+	* time.c (rb_localtime_r2): fix mixed declarations and code.
+
 Sun Jun 13 01:37:40 2010  NARUSE, Yui  <naruse@r...>
 
 	* ext/dl/lib/dl.rb: don't require when already loaded.

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