[Emacs-diffs] Changes to emacs/src/alloc.c

[Stefan Monnier]

Index: emacs/src/alloc.c
diff -c emacs/src/alloc.c:1.317 emacs/src/alloc.c:1.318
*** emacs/src/alloc.c:1.317     Mon Jul 21 05:50:53 2003
--- emacs/src/alloc.c   Mon Jul 21 16:03:18 2003
***************
*** 92,100 ****
  /* 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 VECTOR_MARK(V)                ((V)->size |= ARRAY_MARK_FLAG)
  #define VECTOR_UNMARK(V)      ((V)->size &= ~ARRAY_MARK_FLAG)
--- 92,100 ----
  /* 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 |= 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,112 ****
     strings.  */
  
  #define GC_STRING_BYTES(S)    (STRING_BYTES (S))
! #define GC_STRING_CHARS(S)    ((S)->size & ~MARKBIT)
  
  /* Number of bytes of consing done since the last gc.  */
  
--- 106,112 ----
     strings.  */
  
  #define GC_STRING_BYTES(S)    (STRING_BYTES (S))
! #define GC_STRING_CHARS(S)    ((S)->size & ~ARRAY_MARK_FLAG)
  
  /* Number of bytes of consing done since the last gc.  */
  
***************
*** 1446,1452 ****
  string_bytes (s)
       struct Lisp_String *s;
  {
!   int nbytes = (s->size_byte < 0 ? s->size & ~MARKBIT : s->size_byte);
    if (!PURE_POINTER_P (s)
        && s->data
        && nbytes != SDATA_NBYTES (SDATA_OF_STRING (s)))
--- 1446,1452 ----
  string_bytes (s)
       struct Lisp_String *s;
  {
!   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)))