From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 14 Apr 2011 03:04:14 +0000 (-0700)
Subject: * xmenu.c (x_menu_wait_for_event): Export only if USE_MOTIF.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~300
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6f37259d326459347925b92219d1c573c6ab6dd0;p=emacs.git

* 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 5c1db97c9cc..269dcf02eb0 100644
--- 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 721019ffc56..43badb94e54 100644
--- 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 5c17e24bf23..bd5cf2dbd31 100644
--- 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 *);