From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 12 Nov 2017 06:59:41 +0000 (-0800)
Subject: Pacify GCC when configured --with-x-toolkit=no
X-Git-Tag: emacs-26.0.91~326
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e470d16448999e79df048b92ae1db4acaafb306f;p=emacs.git

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.
---

diff --git a/oldXMenu/Activate.c b/oldXMenu/Activate.c
index c27005fd9e3..638a20875ae 100644
--- a/oldXMenu/Activate.c
+++ b/oldXMenu/Activate.c
@@ -571,6 +571,7 @@ XMenuActivate(
 						   event.xbutton.window
 						   );
 		if (event_xmp != NULL) continue;
+		FALLTHROUGH;
 	    default:
 		/*
 		 * This is a foreign event.
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);
 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.