From: Martin Rudalics Date: Fri, 25 Jul 2014 09:29:23 +0000 (+0200) Subject: Provisionally fix Windows build broken by last commit. X-Git-Tag: emacs-25.0.90~2636^3~45 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c3dfb46e1c4ee289c0c2b8f6454aba3480e8f1de;p=emacs.git Provisionally fix Windows build broken by last commit. * w32fns.c (menubar_in_use): No more static. * w32term.c (current_popup_menu, menubar_in_use): Declare. --- diff --git a/src/ChangeLog b/src/ChangeLog index 1bc65960e5a..0607409b86c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2014-07-25 Martin Rudalics + + * w32fns.c (menubar_in_use): No more static. + * w32term.c (current_popup_menu, menubar_in_use): Declare. + 2014-07-25 Dmitry Antipov Move hourglass machinery to RIF. diff --git a/src/w32fns.c b/src/w32fns.c index dbd83444c99..14d1cb4e771 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -224,7 +224,7 @@ static int w32_unicode_gui; /* From w32menu.c */ extern HMENU current_popup_menu; -static int menubar_in_use = 0; +int menubar_in_use = 0; /* From w32uniscribe.c */ extern void syms_of_w32uniscribe (void); diff --git a/src/w32term.c b/src/w32term.c index fd902ee7cd5..0a82546d0a6 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -93,6 +93,9 @@ extern void free_frame_menubar (struct frame *); extern int w32_codepage_for_font (char *fontname); extern Cursor w32_load_cursor (LPCTSTR name); +extern HMENU current_popup_menu; +extern int menubar_in_use; + #define x_any_window_to_frame x_window_to_frame #define x_top_window_to_frame x_window_to_frame