* xmenu.c (x_menu_wait_for_event): Export only if USE_MOTIF.

* xterm.h (x_menu_wait_for_event): Declare only if USE_MOTIF.

diff --git a/src/ChangeLog b/src/ChangeLog
index 5c1db97c9ccdc843496cd6e8954271eaca6f2b84..269dcf02eb01800621029b33819c8019aa370a8f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2011-04-14  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * xmenu.c (x_menu_wait_for_event): Export only if USE_MOTIF.
+       * xterm.h (x_menu_wait_for_event): Declare only if USE_MOTIF.
+
        * xdisp.c (draw_row_with_mouse_face): Now static.
        * dispextern.h (draw_row_with_mouse_fave): Remove decl.
 

diff --git a/src/xmenu.c b/src/xmenu.c
index 721019ffc5657615eebc5e11e75fc648ff3df634..43badb94e5499a54c478418af0aa1d6d017c00f8 100644 (file)
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -365,6 +365,9 @@ x_menu_set_in_use (int in_use)
 
 /* Wait for an X event to arrive or for a timer to expire.  */
 
+#ifndef USE_MOTIF
+static
+#endif
 void
 x_menu_wait_for_event (void *data)
 {

diff --git a/src/xterm.h b/src/xterm.h
index 5c17e24bf23b4a9c9aa7babe358285fd11820d89..bd5cf2dbd3180a33a3f770595d5b2e66096ea3d3 100644 (file)
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -1069,7 +1069,9 @@ extern void x_free_dpy_colors (Display *, Screen *, Colormap,
 /* Defined in xmenu.c */
 
 extern void x_menu_set_in_use (int);
+#ifdef USE_MOTIF
 extern void x_menu_wait_for_event (void *data);
+#endif
 extern void x_activate_menubar (struct frame *);
 extern int popup_activated (void);
 extern void initialize_frame_menubar (struct frame *);