From 0cf6e773be4ab563decd19c6a285568e489e80ea Mon Sep 17 00:00:00 2001 From: matz Date: Fri, 14 May 2004 12:26:22 +0000 Subject: * eval.c (eval): warning during eval should not cause deadlock. [ruby-talk:98651] * eval.c (rb_eval): raise TypeError exception for superclass mismatch. [ruby-dev:39567] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6310 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- time.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'time.c') diff --git a/time.c b/time.c index b177c5fbc9..69f31272a2 100644 --- a/time.c +++ b/time.c @@ -1895,11 +1895,11 @@ time_mdump(time) t = tobj->tv.tv_sec; tm = gmtime(&t); - if ((tm->tm_year & 0x1ffff) != tm->tm_year) + if ((tm->tm_year & 0xffff) != tm->tm_year) rb_raise(rb_eArgError, "year too big to marshal"); p = 0x1 << 31 | /* 1 */ - tm->tm_year << 14 | /* 17 */ + tm->tm_year << 14 | /* 16 */ tm->tm_mon << 10 | /* 4 */ tm->tm_mday << 5 | /* 5 */ tm->tm_hour; /* 5 */ @@ -1980,7 +1980,7 @@ time_mload(time, str) } else { p &= ~(1<<31); - tm.tm_year = (p >> 14) & 0x1ffff; + tm.tm_year = (p >> 14) & 0xffff; tm.tm_mon = (p >> 10) & 0xf; tm.tm_mday = (p >> 5) & 0x1f; tm.tm_hour = p & 0x1f; -- cgit v1.2.3