Re: master updated (eb787d7 -> dc18a09)

Re: master updated (eb787d7 -> dc18a09)

[Glenn Morris]

This fails to build with --enable-check-lisp-object-type.
Ref eg https://hydra.nixos.org/build/79513673
    
    In file included from vm-limit.c:21:0:
    lisp.h: In function 'make_pointer_integer_unsafe':
    lisp.h:568:28: error: expected expression before '{' token
     # define LISP_INITIALLY(w) {w}
                                ^
    lisp.h:790:3: note: in expansion of macro 'LISP_INITIALLY'
       LISP_INITIALLY ((Lisp_Word) ((untagged_ptr) (ptr) + LISP_WORD_TAG (tag)))
       ^
    lisp.h:1194:10: note: in expansion of macro 'TAG_PTR'
       return TAG_PTR (Lisp_Int0, p);
              ^
    make[1]: *** [vm-limit.o] Error 1

Re: master updated (eb787d7 -> dc18a09)

[Paul Eggert]

[-- Attachment #1: Type: text/plain, Size: 262 bytes --]

Glenn Morris wrote:
> This fails to build with --enable-check-lisp-object-type.

Thanks for mentioning that. --enable-check-lisp-object-type worked for me, 
perhaps because I'm using a different compiler version. I installed the 
attached; please give it a try.

[-- Attachment #2: 0001-Port-recent-changes-to-older-GCC.patch --]
[-- Type: text/x-patch, Size: 775 bytes --]

From 396a33a3656a0e2bbe2f24a81df64914491c44e5 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 14 Aug 2018 04:38:44 -0700
Subject: [PATCH] Port recent changes to older GCC

Problem reported by Glenn Morris in:
https://lists.gnu.org/r/emacs-devel/2018-08/msg00446.html
* src/lisp.h (make_pointer_integer_unsafe):
Port to older GCC.
---
 src/lisp.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lisp.h b/src/lisp.h
index 18d53537cc..da93efdd93 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -1191,7 +1191,8 @@ XFIXNUMPTR (Lisp_Object a)
 INLINE Lisp_Object
 make_pointer_integer_unsafe (void *p)
 {
-  return TAG_PTR (Lisp_Int0, p);
+  Lisp_Object a = TAG_PTR (Lisp_Int0, p);
+  return a;
 }
 
 INLINE Lisp_Object
-- 
2.17.1