* menu.c [HAVE_X_WINDOWS]: Include "xterm.h".

* Makefile.in (menu.o): Update dependencies.

diff --git a/src/ChangeLog b/src/ChangeLog
index c791352aaf10778e2cd9e8314b20fd8df42023ea..653f39681e25c32e1a9c657da4b851e137eb3e72 100644 (file)
--- 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 a38f7661a42ccdaf7ee34e68c924b56ef2b2aa7e..a64ff668bdd34966ed46673d443df3f31427c83a 100644 (file)
--- 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 a25b7e31c7d86d44ab00e153c5037ab5ea2f84ad..1d57d0104d593d071308a5a693d0833b9d68812f 100644 (file)
--- 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