# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1058817798 0
# Node ID b52e88c3d6d027088e86550bd9eac7fb28d897dd
# Parent  e9d8b19c6bb1e287b47d7faa16c03baa66beb5de
(MARK_STRING, UNMARK_STRING, STRING_MARKED_P)
(GC_STRING_CHARS, string_bytes): Use ARRAY_MARK_FLAG rather than
MARKBIT as the gcmarkbit for strings.

diff -r e9d8b19c6bb1 -r b52e88c3d6d0 src/alloc.c
--- a/src/alloc.c	Mon Jul 21 18:06:33 2003 +0000
+++ b/src/alloc.c	Mon Jul 21 20:03:18 2003 +0000
@@ -92,9 +92,9 @@
 /* Mark, unmark, query mark bit of a Lisp string.  S must be a pointer
    to a struct Lisp_String.  */
 
-#define MARK_STRING(S)		((S)->size |= MARKBIT)
-#define UNMARK_STRING(S)	((S)->size &= ~MARKBIT)
-#define STRING_MARKED_P(S)	((S)->size & MARKBIT)
+#define MARK_STRING(S)		((S)->size |= ARRAY_MARK_FLAG)
+#define UNMARK_STRING(S)	((S)->size &= ~ARRAY_MARK_FLAG)
+#define STRING_MARKED_P(S)	((S)->size & ARRAY_MARK_FLAG)
 
 #define VECTOR_MARK(V)		((V)->size |= ARRAY_MARK_FLAG)
 #define VECTOR_UNMARK(V)	((V)->size &= ~ARRAY_MARK_FLAG)
@@ -106,7 +106,7 @@
    strings.  */
 
 #define GC_STRING_BYTES(S)	(STRING_BYTES (S))
-#define GC_STRING_CHARS(S)	((S)->size & ~MARKBIT)
+#define GC_STRING_CHARS(S)	((S)->size & ~ARRAY_MARK_FLAG)
 
 /* Number of bytes of consing done since the last gc.  */
 
@@ -1446,7 +1446,7 @@
 string_bytes (s)
      struct Lisp_String *s;
 {
-  int nbytes = (s->size_byte < 0 ? s->size & ~MARKBIT : s->size_byte);
+  int nbytes = (s->size_byte < 0 ? s->size & ~ARRAY_MARK_FLAG : s->size_byte);
   if (!PURE_POINTER_P (s)
       && s->data
       && nbytes != SDATA_NBYTES (SDATA_OF_STRING (s)))