aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-06-25 09:01:27 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-06-25 09:01:27 +0000
commita00c1ed6723e9c92d6c09716169cc0210c331fb2 (patch)
treeb2e21f1e5a6560ee92335ea91b5d96d1bebe09e6
parent4bdb5ced9a06532d33e6aa0dd6be49e863b31d22 (diff)
downloadruby-a00c1ed6723e9c92d6c09716169cc0210c331fb2.tar.gz
* include/ruby/node.h (NODE_LMASK, nd_line): shouldn't use int and/or
long carelessly. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12611 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--include/ruby/node.h4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 84a7cf7ef4..968980b8b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun 25 17:59:32 2007 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * include/ruby/node.h (NODE_LMASK, nd_line): shouldn't use int and/or
+ long carelessly.
+
Mon Jun 25 11:36:35 2007 Koichi Sasada <ko1@atdot.net>
* gc.h: add RUBY_ prefix to debug macros.
diff --git a/include/ruby/node.h b/include/ruby/node.h
index a477c9d555..e5920c5247 100644
--- a/include/ruby/node.h
+++ b/include/ruby/node.h
@@ -173,8 +173,8 @@ typedef struct RNode {
RNODE(n)->flags=((RNODE(n)->flags&~NODE_TYPEMASK)|(((t)<<NODE_TYPESHIFT)&NODE_TYPEMASK))
#define NODE_LSHIFT (NODE_TYPESHIFT+7)
-#define NODE_LMASK (((long)1<<(sizeof(NODE*)*CHAR_BIT-NODE_LSHIFT))-1)
-#define nd_line(n) ((unsigned int)(((RNODE(n))->flags>>NODE_LSHIFT)&NODE_LMASK))
+#define NODE_LMASK (((SIGNED_VALUE)1<<(sizeof(NODE*)*CHAR_BIT-NODE_LSHIFT))-1)
+#define nd_line(n) ((VALUE)(((RNODE(n))->flags>>NODE_LSHIFT)&NODE_LMASK))
#define nd_set_line(n,l) \
RNODE(n)->flags=((RNODE(n)->flags&~(-1<<NODE_LSHIFT))|(((l)&NODE_LMASK)<<NODE_LSHIFT))