diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-06-25 09:01:27 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-06-25 09:01:27 +0000 |
| commit | 9daae2c34e64d390ce75d966d20bc0c4e6395ff7 (patch) | |
| tree | b2e21f1e5a6560ee92335ea91b5d96d1bebe09e6 | |
| parent | d54fdc98c26e945dc26bfef9d379682fd6488329 (diff) | |
| download | ruby-9daae2c34e64d390ce75d966d20bc0c4e6395ff7.tar.gz ruby-9daae2c34e64d390ce75d966d20bc0c4e6395ff7.tar.xz ruby-9daae2c34e64d390ce75d966d20bc0c4e6395ff7.zip | |
* include/ruby/node.h (NODE_LMASK, nd_line): shouldn't use int and/or
long carelessly.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@12611 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | include/ruby/node.h | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -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 a477c9d55..e5920c524 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)) |