[Emacs-diffs] trunk r117286: Fix last commit.

[Eli Zaretskii]

------------------------------------------------------------
revno: 117286
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2014-06-07 10:25:49 +0300
message:
  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.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/menu.h                     menu.h-20091113204419-o5vbwnq5f7feedwu-8702
  src/term.c                     term.c-20091113204419-o5vbwnq5f7feedwu-220

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-06-06 19:33:19 +0000
+++ b/src/ChangeLog     2014-06-07 07:25:49 +0000
@@ -1,3 +1,9 @@
+2014-06-07  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * term.c (tty_menu_show) [!HAVE_NTGUI]: Now static.

=== modified file 'src/menu.h'
--- a/src/menu.h        2014-06-06 19:33:19 +0000
+++ b/src/menu.h        2014-06-07 07:25:49 +0000
@@ -64,9 +64,11 @@
 #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 **);

=== modified file 'src/term.c'
--- a/src/term.c        2014-06-06 19:33:19 +0000
+++ b/src/term.c        2014-06-07 07:25:49 +0000
@@ -3582,7 +3582,8 @@
     }
 }
 
-#ifndef HAVE_NTGUI
+/* WINDOWSNT uses this as menu_show_hook, see w32console.c.  */
+#ifndef WINDOWSNT
 static
 #endif
 Lisp_Object