lwlib: pacify gcc -Wmissing-variable-declarations

* lwlib/lwlib.c (lwlib_toolkit_type): Remove unused var.
* lwlib/xlwmenu.c (submenu_destroyed): Now static.
* src/xmenu.c (widget_id_tick): Declare extern, as a FIXME.

(cherry picked from commit ce660c5c304e7261cae66224ad90c0dd3db363af)

diff --git a/lwlib/lwlib.c b/lwlib/lwlib.c
index 354faeed5b2f2fee76fa4242a2c9621fdf9aa480..de978d569ed225b4c14a0615e40a54f3c20b239e 100644 (file)
--- a/lwlib/lwlib.c
+++ b/lwlib/lwlib.c
@@ -61,12 +61,6 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 static widget_info*
 all_widget_info = NULL;
 
-#ifdef USE_MOTIF
-const char *lwlib_toolkit_type = "motif";
-#else
-const char *lwlib_toolkit_type = "lucid";
-#endif
-
 static widget_value *merge_widget_value (widget_value *,
                                          widget_value *,
                                          int, int *);

diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c
index 0f8f94b803c80aaa208d8b56e580863a2444773f..33f3fa2703316f6ef229ef3c6daff2ded297c7c4 100644 (file)
--- a/lwlib/xlwmenu.c
+++ b/lwlib/xlwmenu.c
@@ -248,7 +248,7 @@ XlwMenuClassRec xlwMenuClassRec =
 
 WidgetClass xlwMenuWidgetClass = (WidgetClass) &xlwMenuClassRec;
 
-int submenu_destroyed;
+static int submenu_destroyed;
 
 static int next_release_must_exit;
 

diff --git a/src/xmenu.c b/src/xmenu.c
index 8682e67dad408daf6c10c2668d3cbc476658635c..6dd7b3f37a01b9a5184b24483f76488771fbe382 100644 (file)
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1607,6 +1607,7 @@ create_and_show_popup_menu (struct frame *f, widget_value *first_wv,
 
    For menu bars, we use numbers starting at 0, counted in
    next_menubar_widget_id.  */
+extern LWLIB_ID widget_id_tick; /* FIXME: Move this to a .h file.  */
 LWLIB_ID widget_id_tick;
 
 static void