From: Stefan Monnier Date: Sun, 6 Jul 2003 21:09:31 +0000 (+0000) Subject: (MARKBIT): Remove definition since lisp.h does not compare X-Git-Tag: ttn-vms-21-2-B4~9470 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4698665ff54dc0dde4345e52025a67f06f233018;p=emacs.git (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 6d92475eb48..5ce80c64743 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,13 @@ 2003-07-06 Stefan Monnier + * 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 c7cfbf8b847..8043ca0178b 100644 --- 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 0d74bc9c83e..a765fab1543 100644 --- 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 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))