1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28305 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2010-06-12 16:40:25 +00:00
parent 75033ea16f
commit 051af24359
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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.

3
time.c
View File

@ -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