(FLOAT_TO_INT2, FLOAT_TO_INT): Use FIXNUM_OVERFLOW_P.

diff --git a/src/floatfns.c b/src/floatfns.c
index db1c3a7231ef3661e50459b0875966a12b9a0187..926235f5fe2f406f4a6aa1bedd6f18340ba72f79 100644 (file)
--- a/src/floatfns.c
+++ b/src/floatfns.c
@@ -183,8 +183,7 @@ static char *float_error_fn_name;
 #define FLOAT_TO_INT(x, i, name, num)                                  \
   do                                                                   \
     {                                                                  \
-      if ((x) >= (((EMACS_INT) 1) << (VALBITS-1)) ||                   \
-         (x) <= - (((EMACS_INT) 1) << (VALBITS-1)) - 1)                \
+      if (FIXNUM_OVERFLOW_P (x))                                       \
        range_error (name, num);                                        \
       XSETINT (i,  (EMACS_INT)(x));                                    \
     }                                                                  \
@@ -192,8 +191,7 @@ static char *float_error_fn_name;
 #define FLOAT_TO_INT2(x, i, name, num1, num2)                          \
   do                                                                   \
     {                                                                  \
-      if ((x) >= (((EMACS_INT) 1) << (VALBITS-1)) ||                   \
-         (x) <= - (((EMACS_INT) 1) << (VALBITS-1)) - 1)                \
+      if (FIXNUM_OVERFLOW_P (x))                                       \
        range_error2 (name, num1, num2);                                \
       XSETINT (i,  (EMACS_INT)(x));                                    \
     }                                                                  \