(MARKBIT): Remove definition since lisp.h does not compare

MARKBIT and ARRAY_MARK_FLAG any more.

diff --git a/src/ChangeLog b/src/ChangeLog
index 6d92475eb4865a55fd0327f96463b9a212c692c3..5ce80c64743539e62046ec4c4df4a0ed4c3aceb5 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,13 @@
 2003-07-06  Stefan Monnier  <monnier@cs.yale.edu>
 
+       * m/amdx86-64.h (MARKBIT):
+       * m/ia64.h (MARKBIT): Remove definition since lisp.h does not compare
+       MARKBIT and ARRAY_MARK_FLAG any more.
+
+       * m/hp800.h (XSETMARKBIT):
+       * m/sr2k.h (XSETMARKBIT):
+       * lisp.h (XSETMARKBIT): Remove unused macro.
+
        * lisp.h (mark_object): Change prototype.
 
        * alloc.c (mark_object): Change arg *Lisp_Object -> Lisp_Object.

diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h
index c7cfbf8b847eabd45d8477420fb740faf0f95da4..8043ca0178bfd3c5da761ce957e5acfeba500069 100644 (file)
--- a/src/m/amdx86-64.h
+++ b/src/m/amdx86-64.h
@@ -1,5 +1,5 @@
 /* machine description file for AMD x86-64.
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -101,11 +101,6 @@ Boston, MA 02111-1307, USA.  */
 
 #define VALBITS         60
 
-/* This definition of MARKBIT is necessary because of the comparison of
-   ARRAY_MARK_FLAG and MARKBIT in an #if in lisp.h, which cpp doesn't like. */
-
-#define MARKBIT         0x8000000000000000L
-
 /* Define XINT and XUINT so that they can take arguments of type int */
 #define XINT(a)  (((long) (a) << (BITS_PER_LONG - VALBITS)) >> (BITS_PER_LONG - VALBITS))
 #define XUINT(a) ((long) (a) & VALMASK)

diff --git a/src/m/ia64.h b/src/m/ia64.h
index 0d74bc9c83e8355ba6ddeed61af1e1eedd2471dd..a765fab154310ac4a7c7e1c01ee51bd7051d10b3 100644 (file)
--- a/src/m/ia64.h
+++ b/src/m/ia64.h
@@ -1,12 +1,12 @@
 /* machine description file for the IA-64 architecture.
-   Copyright (C) 2000, 2002 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2003  Free Software Foundation, Inc.
      Contributed by David Mosberger <davidm@hpl.hp.com>
 
 This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -123,11 +123,6 @@ Boston, MA 02111-1307, USA.  */
 
 #define VALBITS         60
 
-/* This definition of MARKBIT is necessary because of the comparison of
-   ARRAY_MARK_FLAG and MARKBIT in an #if in lisp.h, which cpp doesn't like. */
-
-#define MARKBIT         0x8000000000000000L
-
 /* Define XINT and XUINT so that they can take arguments of type int */
 
 #define XINT(a)  (((long) (a) << (BITS_PER_LONG - VALBITS)) >> (BITS_PER_LONG - VALBITS))