* lisp.h (STRING_SET_CHARS): New macro.

(SCHARS, SBYTES): Produce rvalues.

diff --git a/src/lisp.h b/src/lisp.h
index 8c01d9c74de99a29cac1a4d0ce2d586e99d88c30..ca8cd9835eeb53cc6c780683418e8eeab95989fa 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -543,8 +543,11 @@ extern Lisp_Object make_number ();
 
 #define SREF(string, index)    XSTRING (string)->data[index]
 #define SDATA(string)          XSTRING (string)->data
-#define SCHARS(string)         XSTRING (string)->size
-#define SBYTES(string)         STRING_BYTES (XSTRING (string))
+#define SCHARS(string)         (XSTRING (string)->size + 0)
+#define SBYTES(string)         (STRING_BYTES (XSTRING (string)) + 0)
+
+#define STRING_SET_CHARS(string, newsize) \
+    (XSTRING (string)->size = (newsize))
 
 \f
 /* Basic data type for use of intervals.  See the macros in intervals.h.  */