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.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/image.c b/src/image.c
index f15c2788967..53ec3873632 100644
--- a/src/image.c
+++ b/src/image.c
@@ -2525,7 +2525,7 @@ xbm_image_p (Lisp_Object object)
               if (STRINGP (elt))
                 {
                   if (SCHARS (elt)
-                      < (width + BITS_PER_CHAR - 1) / BITS_PER_CHAR)
+                      < (width + CHAR_BIT - 1) / CHAR_BIT)
                     return 0;
                 }
               else if (BOOL_VECTOR_P (elt))
@@ -2540,7 +2540,7 @@ xbm_image_p (Lisp_Object object)
       else if (STRINGP (data))
         {
           if (SCHARS (data)
-              < (width + BITS_PER_CHAR - 1) / BITS_PER_CHAR * height)
+              < (width + CHAR_BIT - 1) / CHAR_BIT * height)
             return 0;
         }
       else if (BOOL_VECTOR_P (data))
@@ -3089,7 +3089,7 @@ xbm_load (struct frame *f, struct image *img)
             {
               int i;
               char *p;
-              int nbytes = (img->width + BITS_PER_CHAR - 1) / BITS_PER_CHAR;
+              int nbytes = (img->width + CHAR_BIT - 1) / CHAR_BIT;
 
               SAFE_NALLOCA (bits, nbytes, img->height);
               p = bits;
@@ -3113,7 +3113,7 @@ xbm_load (struct frame *f, struct image *img)
             int nbytes, i;
             /* Windows mono bitmaps are reversed compared with X.  */
             invertedBits = bits;
-            nbytes = (img->width + BITS_PER_CHAR - 1) / BITS_PER_CHAR;
+            nbytes = (img->width + CHAR_BIT - 1) / CHAR_BIT;
             SAFE_NALLOCA (bits, nbytes, img->height);
             for (i = 0; i < nbytes; i++)
               bits[i] = XBM_BIT_SHUFFLE (invertedBits[i]);