From 88fb40b443b64be3e217e1d5cb50a77659d03330 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 30 Jul 2012 08:30:40 -0700 Subject: [PATCH] * lisp.h (STRING_BYTES_BOUND): Cast entire result to ptrdiff_t. This is a bit clearer. Fix some commentary typos. --- src/ChangeLog | 7 ++++++- src/lisp.h | 8 ++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 907b54d614f..d36fff428fe 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-07-30 Paul Eggert + + * lisp.h (STRING_BYTES_BOUND): Cast entire result to ptrdiff_t. + This is a bit clearer. Fix some commentary typos. + 2012-07-30 Glenn Morris * s/netbsd.h: Let configure include signal.h if needed. @@ -53,7 +58,7 @@ (enum maxargs, enum FLOAT_TO_STRING_BUFSIZE, enum MAX_ALLOCA): New enums, for gdb_make_enums_visible. (GLYPH_MODE_LINE_FACE): Remove; unused. - * alloc.c (STRING_BYTES_MAX): Now a constant, now a macro. + * alloc.c (STRING_BYTES_MAX): Now a constant, not a macro. (gdb_make_enums_visible): Add enum CHARTAB_SIZE_BITS, enum CHAR_TABLE_STANDARD_SLOTS, enum char_bits, enum DEFAULT_HASH_SIZE, enum FLOAT_TO_STRING_BUFSIZE, enum Lisp_Bits, enum Lisp_Compiled, diff --git a/src/lisp.h b/src/lisp.h index 491f648de75..1b88a51d2d4 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -715,12 +715,12 @@ extern ptrdiff_t string_bytes (struct Lisp_String *); would expose alloc.c internal details that we'd rather keep private. - This is a macros for use in static initializers, and a constant for + This is a macro for use in static initializers, and a constant for visibility to GDB. The cast to ptrdiff_t ensures that - STRING_BYTES_BOUND is signed. */ + the macro is signed. */ static ptrdiff_t const STRING_BYTES_BOUND = #define STRING_BYTES_BOUND \ - min (MOST_POSITIVE_FIXNUM, (ptrdiff_t) min (SIZE_MAX, PTRDIFF_MAX) - 1) + ((ptrdiff_t) min (MOST_POSITIVE_FIXNUM, min (SIZE_MAX, PTRDIFF_MAX) - 1)) STRING_BYTES_BOUND; /* Mark STR as a unibyte string. */ @@ -1517,7 +1517,7 @@ enum char_bits CHAR_META = 0x8000000, CHAR_MODIFIER_MASK = - (CHAR_ALT | CHAR_SUPER | CHAR_HYPER | CHAR_SHIFT | CHAR_CTL | CHAR_META), + CHAR_ALT | CHAR_SUPER | CHAR_HYPER | CHAR_SHIFT | CHAR_CTL | CHAR_META, /* Actually, the current Emacs uses 22 bits for the character value itself. */ -- 2.39.2