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.

diff --git a/src/lisp.h b/src/lisp.h
index e2271ef0546a8a5ef3ce18b3c5521b266387fda5..35a88d9b238d503554f62f24f32605ef910d53a0 100644 (file)
--- 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