summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2019-08-15 10:51:03 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2019-08-15 10:53:25 -0700
commit96ef76e4e7df73802bf1f2a19c96a143ae365b66 (patch)
tree26eb99caeb79bbbeb157023db946a152d1eeb1f7
parentaf82a6248ce77f1b14f89cfee677250ff024c2c4 (diff)
downloademacs-96ef76e4e7df73802bf1f2a19c96a143ae365b66.tar.gz
Fix typeof portability issue with bitfields
Problem reported by Glenn Morris in: https://lists.gnu.org/r/emacs-devel/2019-08/msg00300.html * src/lisp.h (lisp_h_make_fixnum): Use typeof (+(n)) instead of typeof (n), so that it works with compilers that do not allow typeof to be applied to a bitfield.
-rw-r--r--src/lisp.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lisp.h b/src/lisp.h
index 1c98925fa8d..56ad99b8e39 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -401,7 +401,7 @@ typedef EMACS_INT Lisp_Word;
XIL ((EMACS_INT) (((EMACS_UINT) (n) << INTTYPEBITS) + Lisp_Int0))
# if defined HAVE_STATEMENT_EXPRESSIONS && defined HAVE_TYPEOF
# define lisp_h_make_fixnum(n) \
- ({ typeof (n) lisp_h_make_fixnum_n = n; \
+ ({ typeof (+(n)) lisp_h_make_fixnum_n = n; \
eassert (!FIXNUM_OVERFLOW_P (lisp_h_make_fixnum_n)); \
lisp_h_make_fixnum_wrap (lisp_h_make_fixnum_n); })
# else