merge revision(s) 19742:

	* time.c (time_mdump, time_mload): preserves GMT status.
	  [ruby-core:19252]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@21971 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 2 deletions

diff --git a/time.c b/time.c
index 59e8721c29..fb1ab30821 100644
--- a/time.c
+++ b/time.c
@@ -1931,6 +1931,7 @@ time_mdump(time)
 	rb_raise(rb_eArgError, "year too big to marshal");
 
     p = 0x1UL        << 31 | /*  1 */
+	tobj->gmt    << 30 | /*  1 */
 	tm->tm_year  << 14 | /* 16 */
 	tm->tm_mon   << 10 | /*  4 */
 	tm->tm_mday  <<  5 | /*  5 */
@@ -1989,7 +1990,7 @@ time_mload(time, str)
     time_t sec, usec;
     unsigned char *buf;
     struct tm tm;
-    int i;
+    int i, gmt;
 
     time_modify(time);
     StringValue(str);
@@ -2011,7 +2012,8 @@ time_mload(time, str)
 	usec = s;
     }
     else {
-       p &= ~(1UL<<31);
+	p &= ~(1UL<<31);
+	gmt        = (p >> 30) & 0x1;
 	tm.tm_year = (p >> 14) & 0xffff;
 	tm.tm_mon  = (p >> 10) & 0xf;
 	tm.tm_mday = (p >>  5) & 0x1f;
@@ -2027,6 +2029,7 @@ time_mload(time, str)
 
     GetTimeval(time, tobj);
     tobj->tm_got = 0;
+    tobj->gmt = gmt;
     tobj->tv.tv_sec = sec;
     tobj->tv.tv_usec = usec;
     return time;