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 1bc65960e5a175d68deebf44cff8bbd64a463a1f..0607409b86cbcda35ed2acc962afc0f38a4b631a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-25  Martin Rudalics  <rudalics@gmx.at>
+
+       * w32fns.c (menubar_in_use): No more static.
+       * w32term.c (current_popup_menu, menubar_in_use): Declare.
+
 2014-07-25  Dmitry Antipov  <dmantipov@yandex.ru>
 
        Move hourglass machinery to RIF.

diff --git a/src/w32fns.c b/src/w32fns.c
index dbd83444c99c24018e1a5efa461f71159da0ebf6..14d1cb4e771d7c56792da05dd4bcbbdccb8f897e 100644 (file)
--- 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 fd902ee7cd5e8760100c9381e7cabd498b8cb8c2..0a82546d0a6f1a9a904e7b5a7ac0c1c30ccbd0e8 100644 (file)
--- 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