diff options
| author | Paul Eggert | 2017-11-11 22:59:41 -0800 |
|---|---|---|
| committer | Paul Eggert | 2017-11-11 23:00:31 -0800 |
| commit | e470d16448999e79df048b92ae1db4acaafb306f (patch) | |
| tree | e7dc52f803f57a8745c6566c2bc0a87da2defd92 /src | |
| parent | 49450d095120f98cc1a42f026fda86500d4ef744 (diff) | |
| download | emacs-e470d16448999e79df048b92ae1db4acaafb306f.tar.gz emacs-e470d16448999e79df048b92ae1db4acaafb306f.zip | |
Pacify GCC when configured --with-x-toolkit=no
Without these changes, Emacs does not build on Fedora 26 x86-64
when configured --with-x-toolkit=no --enable-gcc-warnings.
* oldXMenu/Activate.c (XMenuActivate): Add FALLTHROUGH.
* src/xterm.c (x_dispatch_event): Define only if
USE_X_TOOLKIT || USE_MOTIF || USE_GTK.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xterm.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/xterm.c b/src/xterm.c index e11cde771ab..5e2fc6d20a8 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -231,7 +231,7 @@ static void x_sync_with_move (struct frame *, int, int, bool); | |||
| 231 | static int handle_one_xevent (struct x_display_info *, | 231 | static int handle_one_xevent (struct x_display_info *, |
| 232 | const XEvent *, int *, | 232 | const XEvent *, int *, |
| 233 | struct input_event *); | 233 | struct input_event *); |
| 234 | #if ! (defined USE_X_TOOLKIT || defined USE_MOTIF) | 234 | #if ! (defined USE_X_TOOLKIT || defined USE_MOTIF) && defined USE_GTK |
| 235 | static int x_dispatch_event (XEvent *, Display *); | 235 | static int x_dispatch_event (XEvent *, Display *); |
| 236 | #endif | 236 | #endif |
| 237 | static void x_wm_set_window_state (struct frame *, int); | 237 | static void x_wm_set_window_state (struct frame *, int); |
| @@ -9047,6 +9047,8 @@ handle_one_xevent (struct x_display_info *dpyinfo, | |||
| 9047 | return count; | 9047 | return count; |
| 9048 | } | 9048 | } |
| 9049 | 9049 | ||
| 9050 | #if defined USE_X_TOOLKIT || defined USE_MOTIF || defined USE_GTK | ||
| 9051 | |||
| 9050 | /* Handles the XEvent EVENT on display DISPLAY. | 9052 | /* Handles the XEvent EVENT on display DISPLAY. |
| 9051 | This is used for event loops outside the normal event handling, | 9053 | This is used for event loops outside the normal event handling, |
| 9052 | i.e. looping while a popup menu or a dialog is posted. | 9054 | i.e. looping while a popup menu or a dialog is posted. |
| @@ -9065,6 +9067,7 @@ x_dispatch_event (XEvent *event, Display *display) | |||
| 9065 | 9067 | ||
| 9066 | return finish; | 9068 | return finish; |
| 9067 | } | 9069 | } |
| 9070 | #endif | ||
| 9068 | 9071 | ||
| 9069 | /* Read events coming from the X server. | 9072 | /* Read events coming from the X server. |
| 9070 | Return as soon as there are no more events to be read. | 9073 | Return as soon as there are no more events to be read. |