diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-09-15 15:25:33 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-09-15 15:55:30 -0700 |
| commit | 0bbf00c7f3de9c75372100afc3039d7f5c8a7587 (patch) | |
| tree | 79fccec02fc3a9ceb9e04c16ae2117f725910276 /src/xterm.c | |
| parent | 8f4b6a20bfec96086845b2f7161e121b1e41b4ad (diff) | |
| download | emacs-0bbf00c7f3de9c75372100afc3039d7f5c8a7587.tar.gz | |
Prefer now-standard int width macros
* src/data.c (ULL_WIDTH):
* src/lisp.h (EMACS_INT_WIDTH, BITS_PER_BITS_WORD):
* src/lread.c (read_integer):
* src/term.c (produce_glyphless_glyph):
* src/xterm.c (x_send_scroll_bar_event):
Use *_WIDTH macros instead of CHAR_BIT * sizeof.
* src/data.c (ULL_WIDTH): Rename from BITS_PER_ULL for consistency
with the *_WIDTH standard macros. All uses changed.
* src/gmalloc.c (INT_BIT): Remove. All uses replaced with INT_WIDTH.
* src/lisp.h (EMACS_INT_WIDTH): Rename from BITS_PER_EMACS_INT
for consistency with the *_WIDTH standard macros. All uses changed.
(BITS_PER_CHAR): Remove; all uses replaced by CHAR_BIT. This must
be the same as CHAR_WIDTH and avoids confusion with Elisp
char-width, which counts columns not bits.
(BITS_PER_SHORT): Remove; all uses replaced by SHRT_WIDTH.
(BITS_PER_LONG): Remove; all uses replaced by LONG_WIDTH.
* src/lread.c: Do not include limits.h since CHAR_BIT is no longer
used directly.
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/xterm.c b/src/xterm.c index cd1d712f39a..4c14e62058f 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -5245,9 +5245,8 @@ x_send_scroll_bar_event (Lisp_Object window, enum scroll_bar_part part, struct window *w = XWINDOW (window); struct frame *f = XFRAME (w->frame); intptr_t iw = (intptr_t) w; - enum { BITS_PER_INTPTR = CHAR_BIT * sizeof iw }; - verify (BITS_PER_INTPTR <= 64); - int sign_shift = BITS_PER_INTPTR - 32; + verify (INTPTR_WIDTH <= 64); + int sign_shift = INTPTR_WIDTH - 32; block_input (); |