diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2003-07-21 20:03:35 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2003-07-21 20:03:35 +0000 |
| commit | 7cdee93615e6ac370d08ffd6503107793cafe0ec (patch) | |
| tree | f93be4a0e0fedf6d28581ee1b63c74634c1b872d /src | |
| parent | ec589b784a03ee7f6a36f871e35e41e0adedf909 (diff) | |
| download | emacs-7cdee93615e6ac370d08ffd6503107793cafe0ec.tar.gz | |
(MARK_STRING, UNMARK_STRING, STRING_MARKED_P)
(GC_STRING_CHARS, string_bytes): Use ARRAY_MARK_FLAG rather than
MARKBIT as the gcmarkbit for strings.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/alloc.c | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index d9a9e36a0a1..05d260ade6c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2003-07-21 Stefan Monnier <monnier@cs.yale.edu> + + * alloc.c (MARK_STRING, UNMARK_STRING, STRING_MARKED_P) + (GC_STRING_CHARS, string_bytes): Use ARRAY_MARK_FLAG rather than + MARKBIT as the gcmarkbit for strings. + 2003-07-21 Richard M. Stallman <rms@gnu.org> * s/openbsd.h (LD_SWITCH_SYSTEM_TEMACS): Add undef. diff --git a/src/alloc.c b/src/alloc.c index 7a27055e2bd..102bc637b58 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -92,9 +92,9 @@ static __malloc_size_t bytes_used_when_full; /* 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 @@ static __malloc_size_t bytes_used_when_full; 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 @@ int 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))) |