bug#54382: 28.0.92; --with-x-toolkit=no leads to "FALLTHROUGH undefined" in Activate.c

[Paul Eggert <eggert@cs.ucla.edu>]

[-- Attachment #1: Type: text/plain, Size: 79 bytes --]

I installed the attached further patch, which should fix this in a 
better way.

[-- Attachment #2: 0001-Another-fix-for-the-no-toolkit-build.patch --]
[-- Type: text/x-patch, Size: 1540 bytes --]

From adc6e855c19a7c9da6aa37c32710e67e4bff97b6 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 14 Mar 2022 13:14:23 -0700
Subject: [PATCH] Another fix for the no-toolkit build

This should be better in the long run.
* oldXMenu/Activate.c (XMenuActivate): Revert previous change,
eliminating the goto it introduced.
* oldXMenu/XMenuInt.h: Include <attribute.h>, for FALLTHROUGH.
---
 oldXMenu/Activate.c | 7 ++-----
 oldXMenu/XMenuInt.h | 2 ++
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/oldXMenu/Activate.c b/oldXMenu/Activate.c
index 410782e60a..e679c2ffed 100644
--- a/oldXMenu/Activate.c
+++ b/oldXMenu/Activate.c
@@ -615,8 +615,8 @@ XMenuActivate(
 						   event.xbutton.window
 						   );
 		if (event_xmp != NULL) continue;
-
-	queue:
+		FALLTHROUGH;
+	    default:
 		/*
 		 * This is a foreign event.
 		 * Queue it for later return to the X event queue.
@@ -629,9 +629,6 @@ XMenuActivate(
 		feq_tmp->event = event;
 		feq_tmp->next = feq;
 		feq = feq_tmp;
-		break;
-	    default:
-		goto queue;
 	    }
     }
     /*
diff --git a/oldXMenu/XMenuInt.h b/oldXMenu/XMenuInt.h
index 86b8e057cd..5d5365ad8f 100644
--- a/oldXMenu/XMenuInt.h
+++ b/oldXMenu/XMenuInt.h
@@ -37,6 +37,8 @@ #define _XMenuInternal_h_
 
 #include <config.h>
 
+#include <attribute.h>
+
 /* Avoid warnings about redefining NULL by including <stdio.h> first;
    the other file which wants to define it (<stddef.h> on Ultrix
    systems) can deal if NULL is already defined, but <stdio.h> can't.  */
-- 
2.35.1