From 7d91217a0a65ff24ab629bd63870a5b0a36775de Mon Sep 17 00:00:00 2001
From: Kazuki Yamaguchi <k@rhe.jp>
Date: Sat, 9 Sep 2017 16:31:33 +0900
Subject: ruby.h: simplify RB_NUM2INT() and RB_FIX2INT() declaration

---
 numeric.c | 34 ++++------------------------------
 1 file changed, 4 insertions(+), 30 deletions(-)

(limited to 'numeric.c')

diff --git a/numeric.c b/numeric.c
index 480ab7e0cb..739c968e6d 100644
--- a/numeric.c
+++ b/numeric.c
@@ -2878,14 +2878,6 @@ rb_out_of_int(SIGNED_VALUE num)
 	     num, num < 0 ? "small" : "big");
 }
 
-static void
-check_int(long num)
-{
-    if ((long)(int)num != num) {
-	rb_out_of_int(num);
-    }
-}
-
 static void
 check_uint(unsigned long num, int sign)
 {
@@ -2901,24 +2893,6 @@ check_uint(unsigned long num, int sign)
     }
 }
 
-long
-rb_num2int(VALUE val)
-{
-    long num = rb_num2long(val);
-
-    check_int(num);
-    return num;
-}
-
-long
-rb_fix2int(VALUE val)
-{
-    long num = FIXNUM_P(val)?FIX2LONG(val):rb_num2long(val);
-
-    check_int(num);
-    return num;
-}
-
 unsigned long
 rb_num2uint(VALUE val)
 {
@@ -2942,19 +2916,19 @@ rb_fix2uint(VALUE val)
     check_uint(num, negative_int_p(val));
     return num;
 }
-#else
+#endif
+
 long
 rb_num2int(VALUE val)
 {
-    return rb_num2long(val);
+    return NUM2INT(val);
 }
 
 long
 rb_fix2int(VALUE val)
 {
-    return FIX2INT(val);
+    return FIX2INT(val)
 }
-#endif
 
 NORETURN(static void rb_out_of_short(SIGNED_VALUE num));
 static void
-- 
cgit v1.2.3