Subject: bug#25128: Reorder lisp.h to declare types before using them

From: Paul Eggert <[email-masked]>
Date: Sun, 25 Dec 2016 10:15:27 -0800

Eli Zaretskii wrote:
> However, it breaks the MS-Windows 32-bit build --with-wide-int:

Sorry about that. Should be fixed now, with the attached:
>From 8c0f6ba65d4a277b0e99c3ce15c82f308d964f04 Mon Sep 17 00:00:00 2001
From: Paul Eggert <[email-masked]>
Date: Sun, 25 Dec 2016 10:12:39 -0800
Subject: [PATCH] Fix typo in lisp.h reordering patch

* src/lisp.h (XUNTAG) [!USE_LSB_TAG]: Remove duplicate defn.
Reported by Eli Zaretskii (Bug#25128#19).
---
 src/lisp.h | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/lisp.h b/src/lisp.h
index 23d3ae4..dc2c7a6 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -996,14 +996,6 @@ XFASTINT (Lisp_Object a)
   return n;
 }
 
-/* Extract A's pointer value, assuming A's type is TYPE.  */
-INLINE void *
-XUNTAG (Lisp_Object a, int type)
-{
-  intptr_t i = USE_LSB_TAG ? XLI (a) - type : XLI (a) & VALMASK;
-  return (void *) i;
-}
-
 #endif /* ! USE_LSB_TAG */
 
 /* Extract A's value as an unsigned integer.  */
-- 
2.7.4