From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 16 Sep 2023 17:03:59 +0000 (+0300)
Subject: Revert "Don't use pointer arithmetic for untagging Lisp values"
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2a8ad64ddd9b0d0511a91adcbb73a0e7e7930f19;p=emacs.git

Revert "Don't use pointer arithmetic for untagging Lisp values"

This reverts commit 056c99a34c143e1b5162366db07a143ac2b10631.
It broke compilation of 32-bit build --with-wide-int.
---

diff --git a/src/lisp.h b/src/lisp.h
index 35a88d9b238..50b68f2e767 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -811,7 +811,7 @@ INLINE void
    extracted pointer's type is CTYPE *.  */
 
 #define XUNTAG(a, type, ctype) ((ctype *) \
-				((uintptr_t) XLP (a) - LISP_WORD_TAG (type)))
+				((char *) XLP (a) - LISP_WORD_TAG (type)))
 
 /* A forwarding pointer to a value.  It uses a generic pointer to
    avoid alignment bugs that could occur if it used a pointer to a