summaryrefslogtreecommitdiff
path: root/time.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-07-03 20:07:10 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-07-03 20:07:10 +0000
commit1564ed2f0a54c16fb054304edd6514f2fce5ac30 (patch)
tree443079f17eb9e24e8ec1465a85b5ac986f663f31 /time.c
parentff1a30b17f5ee8da023b8737195edb7c332eade0 (diff)
* 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@10465 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'time.c')
-rw-r--r--time.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/time.c b/time.c
index 60c0e6b641..ffaad3baa4 100644
--- a/time.c
+++ b/time.c
@@ -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;