diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-07-03 20:07:10 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-07-03 20:07:10 +0000 |
| commit | fe602671f0f77ef40689a9f815ad27357797f59b (patch) | |
| tree | 443079f17eb9e24e8ec1465a85b5ac986f663f31 /time.c | |
| parent | 6824e7217d9f34cc21d3dd84c14f1d6c9d41352a (diff) | |
| download | ruby-fe602671f0f77ef40689a9f815ad27357797f59b.tar.gz ruby-fe602671f0f77ef40689a9f815ad27357797f59b.tar.xz ruby-fe602671f0f77ef40689a9f815ad27357797f59b.zip | |
* bignum.c: ruby 1.9 HEAD 64 bit warnings clean up from
<ville.mattila at stonesoft.com>. [ruby-core:08120]
* ChangeLog: remove some direct reference to mail addresses
to prevent spams.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@10465 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'time.c')
| -rw-r--r-- | time.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1923,8 +1923,8 @@ time_mdump(VALUE time) if ((tm->tm_year & 0xffff) != tm->tm_year) rb_raise(rb_eArgError, "year too big to marshal"); - - p = 0x1 << 31 | /* 1 */ + + p = 0x1UL << 31 | /* 1 */ tobj->gmt << 30 | /* 1 */ tm->tm_year << 14 | /* 16 */ tm->tm_mon << 10 | /* 4 */ @@ -1994,13 +1994,13 @@ time_mload(VALUE time, VALUE str) s |= buf[i]<<(8*(i-4)); } - if ((p & (1<<31)) == 0) { + if ((p & (1UL<<31)) == 0) { gmt = 0; sec = p; usec = s; } else { - p &= ~(1<<31); + p &= ~(1UL<<31); gmt = (p >> 30) & 0x1; tm.tm_year = (p >> 14) & 0xffff; tm.tm_mon = (p >> 10) & 0xf; |
