emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 56c9ecc: Fix compilation of the --with-wide-int configuration


From: Eli Zaretskii
Subject: master 56c9ecc: Fix compilation of the --with-wide-int configuration
Date: Sun, 11 Jul 2021 11:24:42 -0400 (EDT)

branch: master
commit 56c9ecc78a94a6154ecf3434ae8b40ce04d0a9ce
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Fix compilation of the --with-wide-int configuration
    
    * src/alloc.c (mark_maybe_pointer): Fix a recent change for
    WIDE_EMACS_INT builds.  (Bug#49261)
---
 src/alloc.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/alloc.c b/src/alloc.c
index b3668d2..e3b038c 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -4764,7 +4764,11 @@ mark_maybe_pointer (void *p, bool symbol_only)
         from Emacs source code, it can occur in some cases.  To fix
         this problem, the pdumper code should grok non-initial
         addresses, as the non-pdumper code does.  */
+#ifdef WIDE_EMACS_INT
+      uintptr_t mask = ~((uintptr_t) 0);
+#else
       uintptr_t mask = VALMASK;
+#endif
       void *po = (void *) ((uintptr_t) p & mask);
       char *cp = p;
       char *cpo = po;



reply via email to

[Prev in Thread] Current Thread [Next in Thread]