# HG changeset patch
# User Jan D <jan.h.d@swipnet.se>
# Date 1281092669 -7200
# Node ID d349244d7b08871d3283a397a321678274dba8b7
# Parent  9cfca8c9fb07d7412e84d9114d36e730cadc253b
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.

diff -r 9cfca8c9fb07 -r d349244d7b08 src/ChangeLog
--- a/src/ChangeLog	Fri Aug 06 12:12:41 2010 +0200
+++ b/src/ChangeLog	Fri Aug 06 13:04:29 2010 +0200
@@ -1,5 +1,9 @@
 2010-08-06  Jan Djärv  <jan.h.d@swipnet.se>
 
+	* 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.
diff -r 9cfca8c9fb07 -r d349244d7b08 src/nsterm.h
--- a/src/nsterm.h	Fri Aug 06 12:12:41 2010 +0200
+++ b/src/nsterm.h	Fri Aug 06 13:04:29 2010 +0200
@@ -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);
diff -r 9cfca8c9fb07 -r d349244d7b08 src/window.c
--- a/src/window.c	Fri Aug 06 12:12:41 2010 +0200
+++ b/src/window.c	Fri Aug 06 13:04:29 2010 +0200
@@ -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;