ruby-changes:7244
From: akr <ko1@a...>
Date: Fri, 22 Aug 2008 04:34:41 +0900 (JST)
Subject: [ruby-changes:7244] Ruby:r18763 (trunk): * include/ruby/ruby.h: fix previous change for LP64.
akr 2008-08-22 04:34:24 +0900 (Fri, 22 Aug 2008) New Revision: 18763 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18763 Log: * include/ruby/ruby.h: fix previous change for LP64. Modified files: trunk/ChangeLog trunk/include/ruby/ruby.h Index: include/ruby/ruby.h =================================================================== --- include/ruby/ruby.h (revision 18762) +++ include/ruby/ruby.h (revision 18763) @@ -403,13 +403,13 @@ #define NUM2ULONG(x) rb_num2ulong((VALUE)x) #if SIZEOF_INT < SIZEOF_LONG long rb_num2int(VALUE); +long rb_fix2int(VALUE); +#define FIX2INT(x) ((int)rb_fix2int((VALUE)x)) static inline int NUM2INT(VALUE x) { return FIXNUM_P(x) ? FIX2INT(x) : rb_num2int(x); } -long rb_fix2int(VALUE); -#define FIX2INT(x) ((int)rb_fix2int((VALUE)x)) unsigned long rb_num2uint(VALUE); #define NUM2UINT(x) ((unsigned int)rb_num2uint(x)) unsigned long rb_fix2uint(VALUE); @@ -454,7 +454,9 @@ static inline VALUE INT2NUM(int v) { +# if SIZEOF_VALUE <= SIZEOF_INT if (FIXABLE(v)) return INT2FIX(v); +# endif return rb_int2big(v); } static inline VALUE @@ -466,7 +468,9 @@ static inline VALUE UINT2NUM(unsigned int v) { +# if SIZEOF_VALUE <= SIZEOF_INT if (POSFIXABLE(v)) return LONG2FIX(v); +# endif return rb_uint2big(v); } static inline VALUE Index: ChangeLog =================================================================== --- ChangeLog (revision 18762) +++ ChangeLog (revision 18763) @@ -1,3 +1,7 @@ +Fri Aug 22 04:33:56 2008 Tanaka Akira <akr@f...> + + * include/ruby/ruby.h: fix previous change for LP64. + Fri Aug 22 03:19:41 2008 Tanaka Akira <akr@f...> * include/ruby/ruby.h (NUM2LONG): make it inline function to evaluete -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/