Generalize common compile-time constants.

* lisp.h (header_size, bool_header_size, word_size): Now here.
(struct Lisp_Vector): Add comment.
(struct Lisp_Bool_Vector): Move up to define handy constants.
(VECSIZE, PSEUDOVECSIZE): Simplify.
(SAFE_ALLOCA_LISP): Use new constant.  Adjust indentation.
* buffer.c, buffer.h, bytecode.c, callint.c, eval.c, fns.c:
* font.c, fontset.c, keyboard.c, keymap.c, macros.c, menu.c:
* msdos.c, w32menu.c, w32term.h, window.c, xdisp.c, xfaces.c:
* xfont.c, xmenu.c: Use word_size where appropriate.

1 files changed, 1 insertions, 1 deletions

diff --git a/src/w32term.h b/src/w32term.h
index c0a958ba5e5..ccbf3c42c0e 100644
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -429,7 +429,7 @@ struct scroll_bar {
 #define SCROLL_BAR_VEC_SIZE                                     \
   ((sizeof (struct scroll_bar)                                  \
     - sizeof (EMACS_INT) - sizeof (struct Lisp_Vector *))       \
-   / sizeof (Lisp_Object))
+   / word_size)
 
 /* Turning a lisp vector value into a pointer to a struct scroll_bar.  */
 #define XSCROLL_BAR(vec) ((struct scroll_bar *) XVECTOR (vec))