diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-03-15 08:51:31 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-03-15 08:51:31 +0000 |
| commit | 6ba0d31e8ffe03c6372ab41cae24770d71a54017 (patch) | |
| tree | 37f3cc389dc8c449e81dc137d28552aee1a4c1bf /numeric.c | |
| parent | 23beb1a9dd6654262d17d9dde4f8566d8c4277cc (diff) | |
* bignum.c, intern.h (rb_ull2big, rb_ll2big, rb_ull2inum, rb_ll2inum,
big2ull, rb_big2ull, rb_big2ll): use LONG_LONG macro instead of
long long.
* numeric.c, intern.h, ruby.h (rb_num2ll, rb_num2ull): ditto.
* ruby.h: use _I64_MAX and _I64_MIN if they are defined (for VC++).
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2207 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'numeric.c')
| -rw-r--r-- | numeric.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -871,7 +871,7 @@ rb_num2fix(val) #if HAVE_LONG_LONG -long long +LONG_LONG rb_num2ll(val) VALUE val; { @@ -879,13 +879,13 @@ rb_num2ll(val) rb_raise(rb_eTypeError, "no implicit conversion from nil"); } - if (FIXNUM_P(val)) return (long long)FIX2LONG(val); + if (FIXNUM_P(val)) return (LONG_LONG)FIX2LONG(val); switch (TYPE(val)) { case T_FLOAT: if (RFLOAT(val)->value <= (double)LLONG_MAX && RFLOAT(val)->value >= (double)LLONG_MIN) { - return (long long)(RFLOAT(val)->value); + return (LONG_LONG)(RFLOAT(val)->value); } else { char buf[24]; @@ -914,14 +914,14 @@ rb_num2ll(val) } } -unsigned long long +unsigned LONG_LONG rb_num2ull(val) VALUE val; { if (TYPE(val) == T_BIGNUM) { return rb_big2ull(val); } - return (unsigned long long)rb_num2ll(val); + return (unsigned LONG_LONG)rb_num2ll(val); } #endif /* HAVE_LONG_LONG */ |