Merge from trunk.

[gnu-emacs] / src / menu.c

diff --git a/src/menu.c b/src/menu.c
index 7eda4c6ebb5aad78ba4ce108d9818a9f08708a28..fa31c8a51c1b01888d6433505765c9c3845de9af 100644 (file)
--- a/src/menu.c
+++ b/src/menu.c
@@ -67,6 +67,9 @@ Lisp_Object menu_items;
 
 /* If non-nil, means that the global vars defined here are already in use.
    Used to detect cases where we try to re-enter this non-reentrant code.  */
+#if ! (defined USE_GTK || defined USE_MOTIF)
+static
+#endif
 Lisp_Object menu_items_inuse;
 
 /* Number of slots currently allocated in menu_items.  */