shyouhei	2009-02-02 20:03:25 +0900 (Mon, 02 Feb 2009)

  New Revision: 21969

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21969

  Log:
    merge revision(s) 19742:
    * time.c (time_mdump, time_mload): preserves GMT status.
      [ruby-core:19252]

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/time.c
    branches/ruby_1_8_6/version.h

Index: ruby_1_8_6/time.c
===================================================================
--- ruby_1_8_6/time.c	(revision 21968)
+++ ruby_1_8_6/time.c	(revision 21969)
@@ -1928,6 +1928,7 @@
 	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 */
@@ -1986,7 +1987,7 @@
     time_t sec, usec;
     unsigned char *buf;
     struct tm tm;
-    int i;
+    int i, gmt;
 
     time_modify(time);
     StringValue(str);
@@ -2008,7 +2009,8 @@
 	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;
@@ -2024,6 +2026,7 @@
 
     GetTimeval(time, tobj);
     tobj->tm_got = 0;
+    tobj->gmt = gmt;
     tobj->tv.tv_sec = sec;
     tobj->tv.tv_usec = usec;
     return time;
Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 21968)
+++ ruby_1_8_6/ChangeLog	(revision 21969)
@@ -1,3 +1,8 @@
+Mon Feb  2 20:03:00 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* time.c (time_mdump, time_mload): preserves GMT status.
+	  [ruby-core:19252]
+
 Mon Feb  2 11:33:26 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* variable.c (autoload_delete, autoload_file): should not delete
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 21968)
+++ ruby_1_8_6/version.h	(revision 21969)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-02-02"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20090202
-#define RUBY_PATCHLEVEL 316
+#define RUBY_PATCHLEVEL 317
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/