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, 2 insertions, 2 deletions

diff --git a/src/xfont.c b/src/xfont.c
index 1ebac6100f2..e3e2eb18c29 100644
--- a/src/xfont.c
+++ b/src/xfont.c
@@ -464,11 +464,11 @@ xfont_list_pattern (Display *display, const char *pattern,
               continue;
             }
           if (memcmp (props, aref_addr (entity, FONT_FOUNDRY_INDEX),
-                      sizeof (Lisp_Object) * 7)
+                      word_size * 7)
               || ! EQ (AREF (entity, FONT_SPACING_INDEX), props[7]))
             {
               memcpy (props, aref_addr (entity, FONT_FOUNDRY_INDEX),
-                      sizeof (Lisp_Object) * 7);
+                      word_size * 7);
               props[7] = AREF (entity, FONT_SPACING_INDEX);
               scripts = xfont_supported_scripts (display, indices[i],
                                                  xfont_scratch_props, encoding);