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

diff --git a/src/w32menu.c b/src/w32menu.c
index 67bd575258e..f6b7e62049a 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -276,7 +276,7 @@ menubar_selection_callback (FRAME_PTR f, void * client_data)
   if (!f)
     return;
   entry = Qnil;
-  subprefix_stack = (Lisp_Object *) alloca (f->menu_bar_items_used * sizeof (Lisp_Object));
+  subprefix_stack = (Lisp_Object *) alloca (f->menu_bar_items_used * word_size);
   vector = FVAR (f, menu_bar_vector);
   prefix = Qnil;
   i = 0;
@@ -387,7 +387,7 @@ set_frame_menubar (FRAME_PTR f, int first_time, int deep_p)
       int previous_menu_items_used = f->menu_bar_items_used;
       Lisp_Object *previous_items
         = (Lisp_Object *) alloca (previous_menu_items_used
-                                  * sizeof (Lisp_Object));
+                                  * word_size);
 
       /* If we are making a new widget, its contents are empty,
          do always reinitialize them.  */
@@ -420,7 +420,7 @@ set_frame_menubar (FRAME_PTR f, int first_time, int deep_p)
       /* Save the frame's previous menu bar contents data.  */
       if (previous_menu_items_used)
         memcpy (previous_items, XVECTOR (FVAR (f, menu_bar_vector))->contents,
-                previous_menu_items_used * sizeof (Lisp_Object));
+                previous_menu_items_used * word_size);
 
       /* Fill in menu_items with the current menu bar contents.
          This can evaluate Lisp code.  */
@@ -665,7 +665,7 @@ w32_menu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
   widget_value **submenu_stack
     = (widget_value **) alloca (menu_items_used * sizeof (widget_value *));
   Lisp_Object *subprefix_stack
-    = (Lisp_Object *) alloca (menu_items_used * sizeof (Lisp_Object));
+    = (Lisp_Object *) alloca (menu_items_used * word_size);
   int submenu_depth = 0;
   int first_pane;