[Emacs-diffs] /srv/bzr/emacs/trunk r100993: Can't include menu.h in window.c for X targets.

[Jan D]

------------------------------------------------------------
revno: 100993
committer: Jan D <address@hidden>
branch nick: trunk
timestamp: Fri 2010-08-06 13:04:29 +0200
message:
  Can't include menu.h in window.c for X targets.
  
  * nsterm.h (x_set_menu_bar_lines): Declare.
  
  * window.c: Don't include menu.h, it depends on lots of other .h-files.
modified:
  src/ChangeLog
  src/nsterm.h
  src/window.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-08-06 10:12:41 +0000
+++ b/src/ChangeLog     2010-08-06 11:04:29 +0000
@@ -1,5 +1,9 @@
 2010-08-06  Jan Djärv  <address@hidden>
 
+       * nsterm.h (x_set_menu_bar_lines): Declare.
+
+       * window.c: Don't include menu.h, it depends on lots of other .h-files.
+
        * xfaces.c (x_create_gc, x_free_gc): Convert to ANSI C prototypes.
 
        * window.c: Include menu.h.

=== modified file 'src/nsterm.h'
--- a/src/nsterm.h      2010-08-06 10:12:41 +0000
+++ b/src/nsterm.h      2010-08-06 11:04:29 +0000
@@ -761,6 +761,7 @@
 extern int x_pixel_width (struct frame *f);
 extern int x_pixel_height (struct frame *f);
 extern void x_set_frame_alpha (struct frame *f);
+extern void x_set_menu_bar_lines (struct frame *, Lisp_Object, Lisp_Object);
 extern void x_set_tool_bar_lines (struct frame *f,
                                   Lisp_Object value,
                                   Lisp_Object oldval);

=== modified file 'src/window.c'
--- a/src/window.c      2010-08-06 10:12:41 +0000
+++ b/src/window.c      2010-08-06 11:04:29 +0000
@@ -37,7 +37,6 @@
 #include "blockinput.h"
 #include "intervals.h"
 #include "termhooks.h"         /* For FRAME_TERMINAL.  */
-#include "menu.h"
 
 #ifdef HAVE_X_WINDOWS
 #include "xterm.h"
@@ -52,7 +51,6 @@
 #include "nsterm.h"
 #endif
 
-
 Lisp_Object Qwindowp, Qwindow_live_p, Qwindow_configuration_p;
 Lisp_Object Qdisplay_buffer;
 Lisp_Object Qscroll_up, Qscroll_down, Qscroll_command;