[Emacs-diffs] trunk r117571: Provisionally fix Windows build broken by last commit.

[Martin Rudalics]

------------------------------------------------------------
revno: 117571
revision-id: address@hidden
parent: address@hidden
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Fri 2014-07-25 11:29:23 +0200
message:
  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.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/w32fns.c                   w32fns.c-20091113204419-o5vbwnq5f7feedwu-945
  src/w32term.c                  w32term.c-20091113204419-o5vbwnq5f7feedwu-950

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-07-25 06:07:14 +0000
+++ b/src/ChangeLog     2014-07-25 09:29:23 +0000
@@ -1,3 +1,8 @@
+2014-07-25  Martin Rudalics  <address@hidden>
+
+       * w32fns.c (menubar_in_use): No more static.
+       * w32term.c (current_popup_menu, menubar_in_use): Declare.
+
 2014-07-25  Dmitry Antipov  <address@hidden>
 
        Move hourglass machinery to RIF.

=== modified file 'src/w32fns.c'
--- a/src/w32fns.c      2014-07-25 06:01:39 +0000
+++ b/src/w32fns.c      2014-07-25 09:29:23 +0000
@@ -224,7 +224,7 @@
 
 /* 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);

=== modified file 'src/w32term.c'
--- a/src/w32term.c     2014-07-25 06:01:39 +0000
+++ b/src/w32term.c     2014-07-25 09:29:23 +0000
@@ -93,6 +93,9 @@
 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