diff options
author | ayumin <ayumin@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-01-13 06:22:56 +0000 |
---|---|---|
committer | ayumin <ayumin@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-01-13 06:22:56 +0000 |
commit | abe4ff9225a17f0c53cbc8c7472841d7b088399b (patch) | |
tree | 5016eac33adfba0d02f51ad41fcb239818910e3a /time.c | |
parent | edfc3526a70e77f04ddc67f6c3dbe57c999c5d94 (diff) |
merge revision(s) 33790:
* time.c (TIME_COPY_GMT): copy vtm.utc_offset and vtm.zone too.
patch by Tomoyuki Chikanaga.
[ruby-dev:44827] [Bug #5586]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34290 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'time.c')
-rw-r--r-- | time.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -1820,7 +1820,10 @@ struct time_object { (tobj)->vtm.utc_offset = (off), \ (tobj)->vtm.zone = NULL) -#define TIME_COPY_GMT(tobj1, tobj2) ((tobj1)->gmt = (tobj2)->gmt) +#define TIME_COPY_GMT(tobj1, tobj2) \ + ((tobj1)->gmt = (tobj2)->gmt, \ + (tobj1)->vtm.utc_offset = (tobj2)->vtm.utc_offset, \ + (tobj1)->vtm.zone = (tobj2)->vtm.zone) static VALUE time_get_tm(VALUE, struct time_object *); #define MAKE_TM(time, tobj) \ |