diff options
| author | Tom Tromey | 2012-09-04 10:10:06 -0600 |
|---|---|---|
| committer | Tom Tromey | 2012-09-04 10:10:06 -0600 |
| commit | bf69f522a9e135f9aa483cedd53e71e915f2bf75 (patch) | |
| tree | 3f73c47fb863ef87f420de1d30858da821072bd9 /src/menu.c | |
| parent | 303324a9232dbc89369faceb6b3530740d0fc1bd (diff) | |
| parent | 6ec9a5a7b5efb129807f567709ca858211ed7840 (diff) | |
| download | emacs-bf69f522a9e135f9aa483cedd53e71e915f2bf75.tar.gz emacs-bf69f522a9e135f9aa483cedd53e71e915f2bf75.zip | |
merge from trunk
Diffstat (limited to 'src/menu.c')
| -rw-r--r-- | src/menu.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/menu.c b/src/menu.c index 3e466b46aa3..20770537326 100644 --- a/src/menu.c +++ b/src/menu.c | |||
| @@ -36,24 +36,13 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 36 | #include "../lwlib/lwlib.h" | 36 | #include "../lwlib/lwlib.h" |
| 37 | #endif | 37 | #endif |
| 38 | 38 | ||
| 39 | #ifdef HAVE_X_WINDOWS | 39 | #ifdef HAVE_WINDOW_SYSTEM |
| 40 | #include "xterm.h" | 40 | #include TERM_HEADER |
| 41 | #endif | 41 | #endif /* HAVE_WINDOW_SYSTEM */ |
| 42 | |||
| 43 | #ifdef HAVE_NS | ||
| 44 | #include "nsterm.h" | ||
| 45 | #endif | ||
| 46 | |||
| 47 | #ifdef USE_GTK | ||
| 48 | #include "gtkutil.h" | ||
| 49 | #endif | ||
| 50 | 42 | ||
| 51 | #ifdef HAVE_NTGUI | 43 | #ifdef HAVE_NTGUI |
| 52 | #include "w32term.h" | ||
| 53 | |||
| 54 | extern AppendMenuW_Proc unicode_append_menu; | 44 | extern AppendMenuW_Proc unicode_append_menu; |
| 55 | extern HMENU current_popup_menu; | 45 | extern HMENU current_popup_menu; |
| 56 | |||
| 57 | #endif /* HAVE_NTGUI */ | 46 | #endif /* HAVE_NTGUI */ |
| 58 | 47 | ||
| 59 | #include "menu.h" | 48 | #include "menu.h" |