Fix last commit.

 src/term.c (tty_menu_show) [WINDOWSNT]: Make tty_menu_show extern
 only for WINDOWSNT.
 src/menu.h (tty_menu_show) [WINDOWSNT]: Declare extern only for WINDOWSNT.

diff --git a/src/ChangeLog b/src/ChangeLog
index 0ba73e595534f0d8adf6ac12c8f37dcbc90ae77b..3b625ebf5d4a67503ac26bef4082e846229588dc 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-07  Eli Zaretskii  <eliz@gnu.org>
+
+       * term.c (tty_menu_show) [WINDOWSNT]: Make tty_menu_show extern
+       only for WINDOWSNT.
+       * menu.h (tty_menu_show) [WINDOWSNT]: Declare extern only for WINDOWSNT.
+
 2014-06-06  Paul Eggert  <eggert@cs.ucla.edu>
 
        * term.c (tty_menu_show) [!HAVE_NTGUI]: Now static.

diff --git a/src/menu.h b/src/menu.h
index 5b15294754d2040dd2add7e4a926824d05eca9f6..42038f54b679114a8fa4f30eb58095d3de08ab53 100644 (file)
--- a/src/menu.h
+++ b/src/menu.h
@@ -64,9 +64,11 @@ extern Lisp_Object x_menu_show (struct frame *, int, int, int,
 #ifdef HAVE_NTGUI
 extern Lisp_Object w32_menu_show (struct frame *, int, int, int,
                                  Lisp_Object, const char **);
+#ifdef WINDOWSNT
 extern Lisp_Object tty_menu_show (struct frame *, int, int, int,
                                  Lisp_Object, const char **);
 #endif
+#endif
 #ifdef HAVE_NS
 extern Lisp_Object ns_menu_show (struct frame *, int, int, int,
                                 Lisp_Object, const char **);

diff --git a/src/term.c b/src/term.c
index f38deb8f4f14655ea56acd07e777de316475ba22..eaac66c3a41d506de47e023d48f478f257e996e7 100644 (file)
--- a/src/term.c
+++ b/src/term.c
@@ -3582,7 +3582,8 @@ tty_menu_new_item_coords (struct frame *f, int which, int *x, int *y)
     }
 }
 
-#ifndef HAVE_NTGUI
+/* WINDOWSNT uses this as menu_show_hook, see w32console.c.  */
+#ifndef WINDOWSNT
 static
 #endif
 Lisp_Object