master 5c13c33e0c: Another fix for the no-toolkit build

[Paul Eggert]

branch: master
commit 5c13c33e0c1b8b2ada18896e7a74b4d31007b09e
Author: Paul Eggert <eggert@cs.ucla.edu>
Commit: Paul Eggert <eggert@cs.ucla.edu>

    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 @@ without express or implied warranty.
 
 #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.  */