diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-05 14:47:06 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-05 14:47:06 +0000 |
| commit | f2f8e5a8433061995f91ddace3c5f51f458f3a58 (patch) | |
| tree | 39302b648ccd00bd9c89a35928f7913aa8198632 | |
| parent | 6220926b5e44e6b444e870747f593de7e33a8074 (diff) | |
| download | ruby-f2f8e5a8433061995f91ddace3c5f51f458f3a58.tar.gz ruby-f2f8e5a8433061995f91ddace3c5f51f458f3a58.tar.xz ruby-f2f8e5a8433061995f91ddace3c5f51f458f3a58.zip | |
* include/ruby/ruby.h (NUM2INT): cast to int.
(FIX2INT): ditto.
(NUM2UINT): cast to unsigned int.
(FIX2UINT): ditto.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@17897 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | include/ruby/ruby.h | 8 |
2 files changed, 11 insertions, 4 deletions
@@ -1,3 +1,10 @@ +Sat Jul 5 23:42:23 2008 Tanaka Akira <akr@fsij.org> + + * include/ruby/ruby.h (NUM2INT): cast to int. + (FIX2INT): ditto. + (NUM2UINT): cast to unsigned int. + (FIX2UINT): ditto. + Sat Jul 5 23:10:41 2008 Tanaka Akira <akr@fsij.org> * io.c (rb_pipe): new function for handling EMFILE and ENFILE diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 2698b98b6..80da7ba7d 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -357,13 +357,13 @@ VALUE rb_num2ulong(VALUE); #define NUM2ULONG(x) rb_num2ulong((VALUE)x) #if SIZEOF_INT < SIZEOF_LONG long rb_num2int(VALUE); -#define NUM2INT(x) (FIXNUM_P(x)?FIX2INT(x):rb_num2int((VALUE)x)) +#define NUM2INT(x) ((int)(FIXNUM_P(x)?FIX2INT(x):rb_num2int((VALUE)x))) long rb_fix2int(VALUE); -#define FIX2INT(x) rb_fix2int((VALUE)x) +#define FIX2INT(x) ((int)rb_fix2int((VALUE)x)) unsigned long rb_num2uint(VALUE); -#define NUM2UINT(x) rb_num2uint(x) +#define NUM2UINT(x) ((unsigned int)rb_num2uint(x)) unsigned long rb_fix2uint(VALUE); -#define FIX2UINT(x) rb_fix2uint(x) +#define FIX2UINT(x) ((unsigned int)rb_fix2uint(x)) #else #define NUM2INT(x) ((int)NUM2LONG(x)) #define NUM2UINT(x) ((unsigned int)NUM2ULONG(x)) |