summaryrefslogtreecommitdiff
path: root/time.c
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-02-15 13:21:10 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-02-15 13:21:10 +0000
commit795b03c71c7949c0c260139d6f8a3e289826fdca (patch)
tree4b077adcbb200de927acac356a919db107d13de2 /time.c
parent3360a65ba7fc04f12fd470aaa6c91a0b94013abd (diff)
* time.c (time_add): propagate fixed time offset.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26670 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'time.c')
-rw-r--r--time.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/time.c b/time.c
index 7bab3760a6..cf0d7d8c39 100644
--- a/time.c
+++ b/time.c
@@ -2909,6 +2909,11 @@ time_add(struct time_object *tobj, VALUE offset, int sign)
GetTimeval(result, tobj);
TIME_SET_UTC(tobj);
}
+ else if (TIME_FIXOFF_P(tobj)) {
+ VALUE off = tobj->vtm.utc_offset;
+ GetTimeval(result, tobj);
+ TIME_SET_FIXOFF(tobj, off);
+ }
return result;
}