diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lisp.h | 13 | ||||
| -rw-r--r-- | src/pdumper.c | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/lisp.h b/src/lisp.h index 9710dbef8d2..56f24d82810 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -1575,10 +1575,15 @@ struct Lisp_String | |||
| 1575 | { | 1575 | { |
| 1576 | struct | 1576 | struct |
| 1577 | { | 1577 | { |
| 1578 | ptrdiff_t size; /* MSB is used as the markbit. */ | 1578 | /* Number of characters in string; MSB is used as the mark bit. */ |
| 1579 | ptrdiff_t size_byte; /* Set to -1 for unibyte strings, | 1579 | ptrdiff_t size; |
| 1580 | -2 for data in rodata, | 1580 | /* If nonnegative, number of bytes in the string (which is multibyte). |
| 1581 | -3 for immovable unibyte strings. */ | 1581 | If negative, the string is unibyte: |
| 1582 | -1 for data normally allocated | ||
| 1583 | -2 for data in rodata (C string constants) | ||
| 1584 | -3 for data that must be immovable (used for bytecode) */ | ||
| 1585 | ptrdiff_t size_byte; | ||
| 1586 | |||
| 1582 | INTERVAL intervals; /* Text properties in this string. */ | 1587 | INTERVAL intervals; /* Text properties in this string. */ |
| 1583 | unsigned char *data; | 1588 | unsigned char *data; |
| 1584 | } s; | 1589 | } s; |
diff --git a/src/pdumper.c b/src/pdumper.c index 903298f17d2..5e6ccd9bd88 100644 --- a/src/pdumper.c +++ b/src/pdumper.c | |||
| @@ -2067,7 +2067,7 @@ dump_interval_tree (struct dump_context *ctx, | |||
| 2067 | static dump_off | 2067 | static dump_off |
| 2068 | dump_string (struct dump_context *ctx, const struct Lisp_String *string) | 2068 | dump_string (struct dump_context *ctx, const struct Lisp_String *string) |
| 2069 | { | 2069 | { |
| 2070 | #if CHECK_STRUCTS && !defined (HASH_Lisp_String_C2CAF90352) | 2070 | #if CHECK_STRUCTS && !defined (HASH_Lisp_String_03B2DF1C8E) |
| 2071 | # error "Lisp_String changed. See CHECK_STRUCTS comment in config.h." | 2071 | # error "Lisp_String changed. See CHECK_STRUCTS comment in config.h." |
| 2072 | #endif | 2072 | #endif |
| 2073 | /* If we have text properties, write them _after_ the string so that | 2073 | /* If we have text properties, write them _after_ the string so that |