diff options
| author | Paul Eggert <[email protected]> | 2011-04-25 14:34:39 -0700 |
|---|---|---|
| committer | Paul Eggert <[email protected]> | 2011-04-25 14:34:39 -0700 |
| commit | 77b37c05572d1028d0ec2c264ac0ed3a89c0f4da (patch) | |
| tree | cb5140f5f92f5f91bb9e8846e5254fc58df52cc4 /src/xmenu.c | |
| parent | b102ceb110a9cd38f5c589c1869747b1e1c792cb (diff) | |
* lisp.h: (XVECTOR_SIZE): Remove. All uses replaced with ASIZE.
(ASIZE): Now contains previous implementation of XVECTOR_SIZE
instead of invoking XVECTOR_SIZE.
Diffstat (limited to 'src/xmenu.c')
| -rw-r--r-- | src/xmenu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xmenu.c b/src/xmenu.c index aac7fd4305..2d6185c16e 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -1011,7 +1011,7 @@ set_frame_menubar (FRAME_PTR f, int first_time, int deep_p) menu_items = f->menu_bar_vector; menu_items_allocated = VECTORP (menu_items) ? ASIZE (menu_items) : 0; - subitems = XVECTOR_SIZE (items) / 4; + subitems = ASIZE (items) / 4; submenu_start = (int *) alloca (subitems * sizeof (int *)); submenu_end = (int *) alloca (subitems * sizeof (int *)); submenu_n_panes = (int *) alloca (subitems * sizeof (int)); @@ -1097,7 +1097,7 @@ set_frame_menubar (FRAME_PTR f, int first_time, int deep_p) /* Now GC cannot happen during the lifetime of the widget_value, so it's safe to store data from a Lisp_String. */ wv = first_wv->contents; - for (i = 0; i < XVECTOR_SIZE (items); i += 4) + for (i = 0; i < ASIZE (items); i += 4) { Lisp_Object string; string = XVECTOR (items)->contents[i + 1]; @@ -1123,7 +1123,7 @@ set_frame_menubar (FRAME_PTR f, int first_time, int deep_p) first_wv = wv; items = FRAME_MENU_BAR_ITEMS (f); - for (i = 0; i < XVECTOR_SIZE (items); i += 4) + for (i = 0; i < ASIZE (items); i += 4) { Lisp_Object string; |