--- a/src/lisp-union.h	Mon Aug 13 11:12:06 2007 +0200
+++ b/src/lisp-union.h	Mon Aug 13 11:13:30 2007 +0200
@@ -23,20 +23,17 @@
 
 /* Definition of Lisp_Object type as a union.
    The declaration order of the objects within the struct members
-   of the union is dependent on ENDIAN-ness and USE_MINIMAL_TAGBITS.
+   of the union is dependent on ENDIAN-ness.
    See lisp-disunion.h for more details.  */
 
 typedef
 union Lisp_Object
 {
   /* if non-valbits are at lower addresses */
-#if defined(WORDS_BIGENDIAN) == defined(USE_MINIMAL_TAGBITS)
+#if defined(WORDS_BIGENDIAN)
   struct
   {
     EMACS_UINT val : VALBITS;
-#if GCMARKBITS > 0
-    unsigned int markbit: GCMARKBITS;
-#endif
     enum_field (Lisp_Type) type : GCTYPEBITS;
   } gu;
 
@@ -55,9 +52,6 @@
   struct
   {
     enum_field (Lisp_Type) type : GCTYPEBITS;
-#if GCMARKBITS > 0
-    unsigned int markbit: GCMARKBITS;
-#endif
     EMACS_UINT val : VALBITS;
   } gu;
 
@@ -82,14 +76,12 @@
      GCC to accept any (yes, any) pointer as the argument of
      a function declared to accept a Lisp_Object. */
   struct nosuchstruct *v;
-  CONST struct nosuchstruct *cv;
+  const struct nosuchstruct *cv;
 }
 Lisp_Object;
 
 #define XCHARVAL(x) ((x).gu.val)
 
-#ifdef USE_MINIMAL_TAGBITS
-
 # define XSETINT(var, value) do {	\
   EMACS_INT xset_value = (value);	\
   Lisp_Object *xset_var = &(var);	\
@@ -108,21 +100,6 @@
 } while (0)
 # define XPNTRVAL(x) ((x).ui)
 
-#else /* ! USE_MINIMAL_TAGBITS */
-
-# define XSETOBJ(var, vartype, value) do {	\
-  EMACS_UINT xset_value = (EMACS_UINT) (value);	\
-  Lisp_Object *xset_var = &(var);		\
-  xset_var->gu.type = (vartype);		\
-  xset_var->gu.markbit = 0;			\
-  xset_var->gu.val = xset_value;		\
-} while (0)
-# define XSETINT(var, value) XSETOBJ (var, Lisp_Type_Int, value)
-# define XSETCHAR(var, value) XSETOBJ (var, Lisp_Type_Char, value)
-# define XPNTRVAL(x) ((x).gu.val)
-
-#endif /* ! USE_MINIMAL_TAGBITS */
-
 INLINE Lisp_Object make_int (EMACS_INT val);
 INLINE Lisp_Object
 make_int (EMACS_INT val)
@@ -146,37 +123,22 @@
 #define XREALINT(x) ((x).s.val)
 #define XUINT(x) ((x).u.val)
 #define XTYPE(x) ((x).gu.type)
-#define XGCTYPE(x) XTYPE (x)
 #define EQ(x,y) ((x).v == (y).v)
 
-#ifdef USE_MINIMAL_TAGBITS
 #define INTP(x) ((x).s.bits)
-#define GC_EQ(x,y) EQ (x, y)
-#else
-#define INTP(x) (XTYPE(x) == Lisp_Type_Int)
-#define GC_EQ(x,y) ((x).gu.val == (y).gu.val && XTYPE (x) == XTYPE (y))
-#endif
-
-#if GCMARKBITS > 0
-/* XMARKBIT accesses the markbit.  Markbits are used only in
-   particular slots of particular structure types.  Other markbits are
-   always zero.  Outside of garbage collection, all mark bits are
-   always zero. */
-# define XMARKBIT(x) ((x).gu.markbit)
-# define XMARK(x) ((void) (XMARKBIT (x) = 1))
-# define XUNMARK(x) ((void) (XMARKBIT (x) = 0))
-#else
-# define XUNMARK(x) DO_NOTHING
-#endif
+#define INT_PLUS(x,y)  make_int (XINT (x) + XINT (y))
+#define INT_MINUS(x,y) make_int (XINT (x) - XINT (y))
+#define INT_PLUS1(x)   make_int (XINT (x) + 1)
+#define INT_MINUS1(x)  make_int (XINT (x) - 1)
 
 /* Convert between a (void *) and a Lisp_Object, as when the
    Lisp_Object is passed to a toolkit callback function */
 #define VOID_TO_LISP(larg,varg) \
      ((void) ((larg).v = (struct nosuchstruct *) (varg)))
 #define CVOID_TO_LISP(larg,varg) \
-     ((void) ((larg).cv = (CONST struct nosuchstruct *) (varg)))
+     ((void) ((larg).cv = (const struct nosuchstruct *) (varg)))
 #define LISP_TO_VOID(larg) ((void *) ((larg).v))
-#define LISP_TO_CVOID(larg) ((CONST void *) ((larg).cv))
+#define LISP_TO_CVOID(larg) ((const void *) ((larg).cv))
 
 /* Convert a Lisp_Object into something that can't be used as an
    lvalue.  Useful for type-checking. */