From 3f2f9b6aff3200f9fde3ce1750410368f03c91a7 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 7 Jun 2014 10:25:49 +0300 Subject: [PATCH] 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. --- src/ChangeLog | 6 ++++++ src/menu.h | 2 ++ src/term.c | 3 ++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 0ba73e59553..3b625ebf5d4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2014-06-07 Eli Zaretskii + + * 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 * term.c (tty_menu_show) [!HAVE_NTGUI]: Now static. diff --git a/src/menu.h b/src/menu.h index 5b15294754d..42038f54b67 100644 --- 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 f38deb8f4f1..eaac66c3a41 100644 --- 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 -- 2.39.2