diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | include/ruby/ruby.h | 10 |
2 files changed, 14 insertions, 2 deletions
@@ -1,4 +1,8 @@ -Mon Aug 6 00:38:52 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> +Mon Aug 6 00:39:24 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * include/ruby/ruby.h (NUM2ULONG): optimize by inline as well as + NUM2LONG, and cast to unsigned long explicitly for the platforms + where SIZEOF_VALUE is larger than SIZEOF_LONG. * include/ruby/ruby.h (NUM2SSIZET): fix type to cast. diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 6c13a26588..9bb00133bd 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -514,7 +514,15 @@ rb_num2long_inline(VALUE x) return (long)rb_num2long(x); } #define NUM2LONG(x) rb_num2long_inline(x) -#define NUM2ULONG(x) rb_num2ulong(x) +static inline unsigned long +rb_num2ulong_inline(VALUE x) +{ + if (FIXNUM_P(x)) + return (unsigned long)FIX2LONG(x); + else + return (unsigned long)rb_num2ulong(x); +} +#define NUM2ULONG(x) rb_num2ulong_inline(x) #if SIZEOF_INT < SIZEOF_LONG long rb_num2int(VALUE); long rb_fix2int(VALUE); |