* lisp.h (STRING_BYTES_BOUND): Cast entire result to ptrdiff_t.

This is a bit clearer.  Fix some commentary typos.
This commit is contained in:
Paul Eggert 2012-07-30 08:30:40 -07:00
parent b65e7c462a
commit 88fb40b443
2 changed files with 10 additions and 5 deletions

View file

@ -1,3 +1,8 @@
2012-07-30 Paul Eggert <eggert@cs.ucla.edu>
* 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 <rgm@gnu.org>
* 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,

View file

@ -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. */