summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog3
-rw-r--r--src/Makefile.in2
-rw-r--r--src/menu.c4
3 files changed, 8 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index c791352aaf1..653f39681e2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
2008-06-08 Andreas Schwab <schwab@suse.de>
+ * menu.c [HAVE_X_WINDOWS]: Include "xterm.h".
+ * Makefile.in (menu.o): Update dependencies.
+
* fontset.c (Ffontset_info): Fix typo.
* Makefile.in (obj): Always add menu.o
diff --git a/src/Makefile.in b/src/Makefile.in
index a38f7661a42..a64ff668bdd 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1167,7 +1167,7 @@ xftfont.o: dispextern.h xterm.h frame.h blockinput.h character.h charset.h \
ftxfont.o: dispextern.h xterm.h frame.h blockinput.h character.h charset.h \
font.h $(config_h)
menu.o: menu.c lisp.h keyboard.h keymap.h frame.h termhooks.h blockinput.h \
- dispextern.h $(srcdir)/../lwlib/lwlib.h gtkutil.h $(config_h)
+ dispextern.h $(srcdir)/../lwlib/lwlib.h xterm.h gtkutil.h $(config_h)
xmenu.o: xmenu.c xterm.h termhooks.h window.h dispextern.h frame.h buffer.h \
charset.h keyboard.h $(srcdir)/../lwlib/lwlib.h blockinput.h atimer.h \
systime.h gtkutil.h msdos.h coding.h $(config_h)
diff --git a/src/menu.c b/src/menu.c
index a25b7e31c7d..1d57d0104d5 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -32,6 +32,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include "../lwlib/lwlib.h"
#endif
+#ifdef HAVE_X_WINDOWS
+#include "xterm.h"
+#endif
+
#ifdef USE_GTK
#include "gtkutil.h"
#endif