(XMARKBIT, XUNMARK): Remove.

6 files changed, 3 insertions, 32 deletions

diff --git a/src/m/hp800.h b/src/m/hp800.h
index f9052e9874..8f08ed3b61 100644
--- a/src/m/hp800.h
+++ b/src/m/hp800.h
@@ -67,12 +67,6 @@ Boston, MA 02111-1307, USA.  */
 
 #define XSET(var, type, ptr) \
    ((var) = ((int)(type) << VALBITS) + (((unsigned) (ptr) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS))
-
-#define XMARKBIT(a) ((a) < 0)
-
-#if 0  /* Loses when sign bit of type field is set.  */
-#define XUNMARK(a) ((a) = (((a) << BITS_PER_INT-GCTYPEBITS-VALBITS) >> BITS_PER_INT-GCTYPEBITS-VALBITS))
-#endif
 
 /* Common definitions for HPUX and GNU/Linux.  */
 
diff --git a/src/m/iris4d.h b/src/m/iris4d.h
index 4fd21da46f..8d3b7a883b 100644
--- a/src/m/iris4d.h
+++ b/src/m/iris4d.h
@@ -1,5 +1,5 @@
 /* machine description file for Iris-4D machines.  Use with s/irix*.h.
-   Copyright (C) 1987, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1987, 2002, 2003  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -170,8 +170,6 @@ Boston, MA 02111-1307, USA.  */
 
 #define XSET(var, type, ptr) \
    ((var) = ((int)(type) << VALBITS) + (((unsigned) (ptr) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS))
-
-#define XUNMARK(a) ((a) = (((unsigned)(a) << BITS_PER_INT-GCTYPEBITS-VALBITS) >> BITS_PER_INT-GCTYPEBITS-VALBITS))
 #endif /* _LP64 */
 
 #ifndef __GNUC__
diff --git a/src/m/mips-siemens.h b/src/m/mips-siemens.h
index b2f8c1005b..11b1f971d2 100644
--- a/src/m/mips-siemens.h
+++ b/src/m/mips-siemens.h
@@ -1,5 +1,5 @@
 /* m- file for Mips machines.
-   Copyright (C) 1987, 1992, 1993, 1995, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1987,1992,1993,95,2002,03  Free Software Foundation, Inc.
 
    This file contains some changes for our SVR4 based SINIX-Mips 5.4.
    I hope this is helpful to port the emacs to our RM?00 series and
@@ -158,10 +158,5 @@ NOTE-END  */
    ((int)(type) << VALBITS)						\
    + (((unsigned) (ptr) << (BITS_PER_INT-VALBITS)) >> (BITS_PER_INT-VALBITS)))
 
-#define XUNMARK(a)							\
-  ((a) =								\
-   (((unsigned)(a) << (BITS_PER_INT-GCTYPEBITS-VALBITS))		\
-    >> (BITS_PER_INT-GCTYPEBITS-VALBITS)))
-
 /* arch-tag: a4f5c090-0bd5-48f0-9724-b7d531f9b6c8
    (do not change this comment) */
diff --git a/src/m/mips.h b/src/m/mips.h
index 5426ec6473..cca4586817 100644
--- a/src/m/mips.h
+++ b/src/m/mips.h
@@ -1,5 +1,5 @@
 /* m- file for Mips machines.
-   Copyright (C) 1987, 1992, 1999, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1992, 1999, 2002, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -170,11 +170,6 @@ NOTE-END  */
   ((var) =								\
    ((int)(type) << VALBITS)						\
    + (((unsigned) (ptr) << (BITS_PER_INT-VALBITS)) >> (BITS_PER_INT-VALBITS)))
-
-#define XUNMARK(a)							\
-  ((a) =								\
-   (((unsigned)(a) << (BITS_PER_INT-GCTYPEBITS-VALBITS))		\
-    >> (BITS_PER_INT-GCTYPEBITS-VALBITS)))
 
 #if !defined (NEWSOS5) && !defined (__linux__)
 #ifdef USG
diff --git a/src/m/news-r6.h b/src/m/news-r6.h
index d4a2b8869f..cf6e019fd0 100644
--- a/src/m/news-r6.h
+++ b/src/m/news-r6.h
@@ -49,10 +49,5 @@
    ((int)(type) << VALBITS)						\
    + (((unsigned) (ptr) << (BITS_PER_INT-VALBITS)) >> (BITS_PER_INT-VALBITS)))
 
-#define XUNMARK(a)							\
-  ((a) =								\
-   (((unsigned)(a) << (BITS_PER_INT-GCTYPEBITS-VALBITS))			\
-    >> (BITS_PER_INT-GCTYPEBITS-VALBITS)))
-
 /* arch-tag: b9fd7b75-ba3c-46d4-8966-24381b13001b
    (do not change this comment) */
diff --git a/src/m/sr2k.h b/src/m/sr2k.h
index c3865a79e7..088ea23d94 100644
--- a/src/m/sr2k.h
+++ b/src/m/sr2k.h
@@ -67,12 +67,6 @@ Boston, MA 02111-1307, USA.  */
 
 #define XSET(var, type, ptr) \
    ((var) = ((int)(type) << VALBITS) + (((unsigned) (ptr) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS))
-
-#define XMARKBIT(a) ((a) < 0)
-
-#if 0  /* Loses when sign bit of type field is set.  */
-#define XUNMARK(a) ((a) = (((a) << BITS_PER_INT-GCTYPEBITS-VALBITS) >> BITS_PER_INT-GCTYPEBITS-VALBITS))
-#endif
 
 /* #ifdef __hpux */
 /* Now define a symbol for the cpu type, if your compiler