From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 7 Mar 2011 06:46:29 +0000 (-0800)
Subject: * xmenu.c (next_menubar_widget_id): Declare only if USE_X_TOOLKIT,
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~605^2^2~71
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=281585b0bd2a6063c11cfcc308a560f416c3eee7;p=emacs.git

* xmenu.c (next_menubar_widget_id): Declare only if USE_X_TOOLKIT,

since it's unused otherwise.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index f1b08f62b8e..a0f797b0e6f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -5,6 +5,8 @@
 	(xmenu_show): Rename parameter to avoid shadowing.
 	(xmenu_show, xdialog_show, xmenu_show): Make local pointers "const"
 	since they might point to immutable storage.
+	(next_menubar_widget_id): Declare only if USE_X_TOOLKIT,
+	since it's unused otherwise.
 
 	* xdisp.c (produce_glyphless_glyph): Initialize lower_xoff.
 	Add a FIXME comment, since the code still doesn't look right.
diff --git a/src/xmenu.c b/src/xmenu.c
index a64b305238b..36684c7dafa 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -124,11 +124,11 @@ static int update_frame_menubar (struct frame *);
    Xt on behalf of one of the widget sets.  */
 static int popup_activated_flag;
 
-static int next_menubar_widget_id;
-
 
 #ifdef USE_X_TOOLKIT
 
+static int next_menubar_widget_id;
+
 /* Return the frame whose ->output_data.x->id equals ID, or 0 if none.  */
 
 static struct frame *