merge revision(s) 28305:

	* time.c (rb_localtime_r2): fix mixed declarations and code.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28306 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index bd409baf5d..a02f7c31dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Jun 13 01:40:52 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* time.c (rb_localtime_r2): fix mixed declarations and code.
+
 Sun Jun 13 01:37:40 2010  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* ext/dl/lib/dl.rb: don't require when already loaded.
diff --git a/time.c b/time.c
index 534ab10c6c..39ddd357ae 100644
--- a/time.c
+++ b/time.c
@@ -873,10 +873,11 @@ rb_localtime_r2(const time_t *t, struct tm *result)
         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