diff options
| author | Jan D | 2010-08-06 13:04:29 +0200 |
|---|---|---|
| committer | Jan D | 2010-08-06 13:04:29 +0200 |
| commit | 4094bf3679e9b64b2c4018edd1ba7e3d63f8d862 (patch) | |
| tree | da1698c79fadf0b8c690d7b762cc0539a1ff5c93 /src/window.c | |
| parent | 3d608a86503ae057e0d2e721a9d9718eae22bf89 (diff) | |
| download | emacs-4094bf3679e9b64b2c4018edd1ba7e3d63f8d862.tar.gz emacs-4094bf3679e9b64b2c4018edd1ba7e3d63f8d862.zip | |
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.
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/window.c b/src/window.c index 29be829005d..1fabe72d72d 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -37,7 +37,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 37 | #include "blockinput.h" | 37 | #include "blockinput.h" |
| 38 | #include "intervals.h" | 38 | #include "intervals.h" |
| 39 | #include "termhooks.h" /* For FRAME_TERMINAL. */ | 39 | #include "termhooks.h" /* For FRAME_TERMINAL. */ |
| 40 | #include "menu.h" | ||
| 41 | 40 | ||
| 42 | #ifdef HAVE_X_WINDOWS | 41 | #ifdef HAVE_X_WINDOWS |
| 43 | #include "xterm.h" | 42 | #include "xterm.h" |
| @@ -52,7 +51,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 52 | #include "nsterm.h" | 51 | #include "nsterm.h" |
| 53 | #endif | 52 | #endif |
| 54 | 53 | ||
| 55 | |||
| 56 | Lisp_Object Qwindowp, Qwindow_live_p, Qwindow_configuration_p; | 54 | Lisp_Object Qwindowp, Qwindow_live_p, Qwindow_configuration_p; |
| 57 | Lisp_Object Qdisplay_buffer; | 55 | Lisp_Object Qdisplay_buffer; |
| 58 | Lisp_Object Qscroll_up, Qscroll_down, Qscroll_command; | 56 | Lisp_Object Qscroll_up, Qscroll_down, Qscroll_command; |