From f24aeaf4ff75386922c3be60e9bd483512cf15d3 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 16 Sep 2023 20:03:30 +0300 Subject: [PATCH] Revert "* src/lisp.h (XUNTAG): Work on 32-bit --with-wide-int builds" This reverts commit c0788f0c476f094a91f7b20f41d0fe50b5b19f9d. Let's finish discussing this before rushing to push. --- src/lisp.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lisp.h b/src/lisp.h index e2271ef0546..35a88d9b238 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -810,8 +810,8 @@ INLINE void /* Extract A's pointer value, assuming A's Lisp type is TYPE and the extracted pointer's type is CTYPE *. */ -#define XUNTAG(a, type, ctype) \ - ((ctype *) ((uintptr_t) XLP (a) - (uintptr_t) LISP_WORD_TAG (type))) +#define XUNTAG(a, type, ctype) ((ctype *) \ + ((uintptr_t) 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 -- 2.39.5