diff options
| author | Andreas Schwab | 2008-06-08 09:26:02 +0000 |
|---|---|---|
| committer | Andreas Schwab | 2008-06-08 09:26:02 +0000 |
| commit | a4240420baeeb3456dbcc3c25989870df1e38541 (patch) | |
| tree | 79da38f93be2014a33c35412305f9dab5d46e881 /src | |
| parent | 660100f3bcc2a55e43de9f3aebe66e34a3c8b7c2 (diff) | |
| download | emacs-a4240420baeeb3456dbcc3c25989870df1e38541.tar.gz emacs-a4240420baeeb3456dbcc3c25989870df1e38541.zip | |
* menu.c [HAVE_X_WINDOWS]: Include "xterm.h".
* Makefile.in (menu.o): Update dependencies.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/Makefile.in | 2 | ||||
| -rw-r--r-- | src/menu.c | 4 |
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 @@ | |||
| 1 | 2008-06-08 Andreas Schwab <schwab@suse.de> | 1 | 2008-06-08 Andreas Schwab <schwab@suse.de> |
| 2 | 2 | ||
| 3 | * menu.c [HAVE_X_WINDOWS]: Include "xterm.h". | ||
| 4 | * Makefile.in (menu.o): Update dependencies. | ||
| 5 | |||
| 3 | * fontset.c (Ffontset_info): Fix typo. | 6 | * fontset.c (Ffontset_info): Fix typo. |
| 4 | 7 | ||
| 5 | * Makefile.in (obj): Always add menu.o | 8 | * 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 \ | |||
| 1167 | ftxfont.o: dispextern.h xterm.h frame.h blockinput.h character.h charset.h \ | 1167 | ftxfont.o: dispextern.h xterm.h frame.h blockinput.h character.h charset.h \ |
| 1168 | font.h $(config_h) | 1168 | font.h $(config_h) |
| 1169 | menu.o: menu.c lisp.h keyboard.h keymap.h frame.h termhooks.h blockinput.h \ | 1169 | menu.o: menu.c lisp.h keyboard.h keymap.h frame.h termhooks.h blockinput.h \ |
| 1170 | dispextern.h $(srcdir)/../lwlib/lwlib.h gtkutil.h $(config_h) | 1170 | dispextern.h $(srcdir)/../lwlib/lwlib.h xterm.h gtkutil.h $(config_h) |
| 1171 | xmenu.o: xmenu.c xterm.h termhooks.h window.h dispextern.h frame.h buffer.h \ | 1171 | xmenu.o: xmenu.c xterm.h termhooks.h window.h dispextern.h frame.h buffer.h \ |
| 1172 | charset.h keyboard.h $(srcdir)/../lwlib/lwlib.h blockinput.h atimer.h \ | 1172 | charset.h keyboard.h $(srcdir)/../lwlib/lwlib.h blockinput.h atimer.h \ |
| 1173 | systime.h gtkutil.h msdos.h coding.h $(config_h) | 1173 | 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/>. */ | |||
| 32 | #include "../lwlib/lwlib.h" | 32 | #include "../lwlib/lwlib.h" |
| 33 | #endif | 33 | #endif |
| 34 | 34 | ||
| 35 | #ifdef HAVE_X_WINDOWS | ||
| 36 | #include "xterm.h" | ||
| 37 | #endif | ||
| 38 | |||
| 35 | #ifdef USE_GTK | 39 | #ifdef USE_GTK |
| 36 | #include "gtkutil.h" | 40 | #include "gtkutil.h" |
| 37 | #endif | 41 | #endif |