procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Can't include menu.h in window.c for X targets.

Browse source 
* nsterm.h (x_set_menu_bar_lines): Declare.

* window.c: Don't include menu.h, it depends on lots of other .h-files.
This commit is contained in:
Jan D 2010-08-06 13:04:29 +02:00
parent 3d608a8650
commit 4094bf3679
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -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.

1
src/nsterm.h
View file

@ -761,6 +761,7 @@ extern int x_char_height (struct frame *f);
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);

2
src/window.c
View file

@ -37,7 +37,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#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 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#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;