procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Pacify GCC when configured --with-x-toolkit=no

Browse source 
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.
This commit is contained in:
Paul Eggert 2017-11-11 22:59:41 -08:00
parent 49450d0951
commit e470d16448
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
oldXMenu/Activate.c
View file

@ -571,6 +571,7 @@ XMenuActivate(
event.xbutton.window
);
if (event_xmp != NULL) continue;
FALLTHROUGH;
default:
/*
* This is a foreign event.

5
src/xterm.c
View file

@ -231,7 +231,7 @@ static void x_sync_with_move (struct frame *, int, int, bool);
static int handle_one_xevent (struct x_display_info *,
const XEvent *, int *,
struct input_event *);
#if ! (defined USE_X_TOOLKIT || defined USE_MOTIF)
#if ! (defined USE_X_TOOLKIT || defined USE_MOTIF) && defined USE_GTK
static int x_dispatch_event (XEvent *, Display *);
#endif
static void x_wm_set_window_state (struct frame *, int);
@ -9047,6 +9047,8 @@ handle_one_xevent (struct x_display_info *dpyinfo,
return count;
}
#if defined USE_X_TOOLKIT || defined USE_MOTIF || defined USE_GTK
/* Handles the XEvent EVENT on display DISPLAY.
This is used for event loops outside the normal event handling,
i.e. looping while a popup menu or a dialog is posted.
@ -9065,6 +9067,7 @@ x_dispatch_event (XEvent *event, Display *display)
return finish;
}
#endif
/* Read events coming from the X server.
Return as soon as there are no more events to be read.