aboutsummaryrefslogtreecommitdiffstats
path: root/src/xmenu.c
diff options
context:
space:
mode:
authorAndreas Schwab2003-05-10 16:14:35 +0000
committerAndreas Schwab2003-05-10 16:14:35 +0000
commitaea448d23c7de2d8d204f931ff1c72ec957dbd3f (patch)
tree4e6a8969b430ec229bd28b89395b06541f910d0b /src/xmenu.c
parent933dcf49eb3d9c51a18047d2d7ab28a50609d138 (diff)
downloademacs-aea448d23c7de2d8d204f931ff1c72ec957dbd3f.tar.gz
emacs-aea448d23c7de2d8d204f931ff1c72ec957dbd3f.zip
(single_menu_item): Change last parameter to void* to
avoid warning.
Diffstat (limited to 'src/xmenu.c')
-rw-r--r--src/xmenu.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/xmenu.c b/src/xmenu.c
index 68aad9c46e8..6d402f660d0 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1,5 +1,5 @@
1/* X Communication module for terminals which understand the X protocol. 1/* X Communication module for terminals which understand the X protocol.
2 Copyright (C) 1986, 88, 93, 94, 96, 99, 2000, 2001 2 Copyright (C) 1986, 88, 93, 94, 96, 99, 2000, 2001, 2003
3 Free Software Foundation, Inc. 3 Free Software Foundation, Inc.
4 4
5This file is part of GNU Emacs. 5This file is part of GNU Emacs.
@@ -417,7 +417,7 @@ struct skp
417 }; 417 };
418 418
419static void single_menu_item P_ ((Lisp_Object, Lisp_Object, Lisp_Object, 419static void single_menu_item P_ ((Lisp_Object, Lisp_Object, Lisp_Object,
420 struct skp*)); 420 void *));
421 421
422/* This is a recursive subroutine of keymap_panes. 422/* This is a recursive subroutine of keymap_panes.
423 It handles one keymap, KEYMAP. 423 It handles one keymap, KEYMAP.
@@ -489,13 +489,14 @@ single_keymap_panes (keymap, pane_name, prefix, notreal, maxdepth)
489 not. */ 489 not. */
490 490
491static void 491static void
492single_menu_item (key, item, dummy, skp) 492single_menu_item (key, item, dummy, skp_v)
493 Lisp_Object key, item, dummy; 493 Lisp_Object key, item, dummy;
494 struct skp *skp; 494 void *skp_v;
495{ 495{
496 Lisp_Object map, item_string, enabled; 496 Lisp_Object map, item_string, enabled;
497 struct gcpro gcpro1, gcpro2; 497 struct gcpro gcpro1, gcpro2;
498 int res; 498 int res;
499 struct skp *skp = skp_v;
499 500
500 /* Parse the menu item and leave the result in item_properties. */ 501 /* Parse the menu item and leave the result in item_properties. */
501 GCPRO2 (key, item); 502 GCPRO2 (key, item);