summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-04-25 06:54:49 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-04-25 06:54:49 +0000
commit62074c45d581d54c3109104f7bcf0251a0cf829e (patch)
tree71bf019b74a024681f4232e6369423bdaa605f88
parent8f782e2792c2f49ba40b8e28295584afabd0c8d3 (diff)
downloadruby-62074c45d581d54c3109104f7bcf0251a0cf829e.tar.gz
ruby-62074c45d581d54c3109104f7bcf0251a0cf829e.tar.xz
ruby-62074c45d581d54c3109104f7bcf0251a0cf829e.zip
* time.c (time_mload): use TIME_SET_UTC.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@23274 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--time.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0faa9d1f6..e5f7cb938 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Apr 25 15:54:04 2009 Tanaka Akira <akr@fsij.org>
+
+ * time.c (time_mload): use TIME_SET_UTC.
+
Sat Apr 25 15:47:54 2009 Tanaka Akira <akr@fsij.org>
* time.c (time_get_tm): take time_object instead of gmt.
@@ -10,7 +14,7 @@ Sat Apr 25 15:39:44 2009 Tanaka Akira <akr@fsij.org>
Sat Apr 25 15:21:33 2009 Tanaka Akira <akr@fsij.org>
- * time.c (TIME_UTC_P): new macro..
+ * time.c (TIME_UTC_P): new macro.
(TIME_SET_UTC): ditto.
(TIME_LOCALTIME_P): ditto.
(TIME_SET_LOCALTIME): ditto.
diff --git a/time.c b/time.c
index 8170958c5..dbea6cafd 100644
--- a/time.c
+++ b/time.c
@@ -3234,7 +3234,7 @@ end_submicro: ;
GetTimeval(time, tobj);
tobj->tm_got = 0;
- tobj->gmt = gmt;
+ if (gmt) TIME_SET_UTC(tobj);
tobj->timev = timev;
return time;