From: Daniel Colascione <dancol@dancol.org>
Date: Thu, 15 Feb 2018 22:13:17 +0000 (-0800)
Subject: Make INTEGER_TO_CONS work with -Wconversion
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6f67aa19dc642ef83e8c41a9676c74143e117c2e;p=emacs.git

Make INTEGER_TO_CONS work with -Wconversion
---

diff --git a/src/lisp.h b/src/lisp.h
index 6d4635f2a7a..45e8a0d7912 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3568,9 +3568,9 @@ extern Lisp_Object arithcompare (Lisp_Object num1, Lisp_Object num2,
    itself, or a cons of two or three integers, or if all else fails a float.
    I should not have side effects.  */
 #define INTEGER_TO_CONS(i)					    \
-  (! FIXNUM_OVERFLOW_P (i)					    \
-   ? make_number (i)						    \
-   : EXPR_SIGNED (i) ? intbig_to_lisp (i) : uintbig_to_lisp (i))
+  (! FIXNUM_OVERFLOW_P ((i))					    \
+   ? make_number ((EMACS_INT) (i))                                      \
+   : EXPR_SIGNED ((i)) ? intbig_to_lisp ((i)) : uintbig_to_lisp ((i)))
 extern Lisp_Object intbig_to_lisp (intmax_t);
 extern Lisp_Object uintbig_to_lisp (uintmax_t);