diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-15 01:36:49 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-15 01:36:49 +0000 |
| commit | 7b7aa9f57360120a02056bbe6e5128d57a99cb7c (patch) | |
| tree | 1c1dbc7c4a5ffa8969991a501ddcfae13b2c8d52 /include | |
| parent | e56eea5e37a43879465d2d1d99e0e0dc89ae8684 (diff) | |
merge revision(s) 34261,34351:
------------------------------------------------------------------------
r34261 | nobu | 2012-01-10 15:52:24 +0900 (Tue, 10 Jan 2012) | 2 lines
* gc.c (HEAP_OBJ_LIMIT): suppress narrowing down warning from gcc 4.2.
------------------------------------------------------------------------
* include/ruby/ruby.h (FIXNUM_P): simple flag should be int.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34617 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include')
| -rw-r--r-- | include/ruby/ruby.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 5b4f9e02e1..fc17f76547 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -335,7 +335,7 @@ rb_long2int(long n) {rb_long2int_internal(n, i); return i;} #define FIX2LONG(x) (long)RSHIFT((SIGNED_VALUE)(x),1) #define FIX2ULONG(x) ((((VALUE)(x))>>1)&LONG_MAX) -#define FIXNUM_P(f) (((SIGNED_VALUE)(f))&FIXNUM_FLAG) +#define FIXNUM_P(f) (((int)(SIGNED_VALUE)(f))&FIXNUM_FLAG) #define POSFIXABLE(f) ((f) < FIXNUM_MAX+1) #define NEGFIXABLE(f) ((f) >= FIXNUM_MIN) #define FIXABLE(f) (POSFIXABLE(f) && NEGFIXABLE(f)) |