diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-12 16:40:25 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-12 16:40:25 +0000 |
commit | 051af24359916791ee09cc6c685d9668e780b61f (patch) | |
tree | 06f058d314a34e4cc777630df5464e479d76d37a | |
parent | 75033ea16f86679164eac5030c230ca50d86d1cf (diff) | |
download | ruby-051af24359916791ee09cc6c685d9668e780b61f.tar.gz |
* time.c (rb_localtime_r2): fix mixed declarations and code.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28305 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | time.c | 3 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Sun Jun 13 01:38:17 2010 NARUSE, Yui <naruse@ruby-lang.org> + + * time.c (rb_localtime_r2): fix mixed declarations and code. + Sun Jun 13 00:27:24 2010 NARUSE, Yui <naruse@ruby-lang.org> * ext/dl/lib/dl.rb: don't require when already loaded. @@ -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 |