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.

diff --git a/oldXMenu/Activate.c b/oldXMenu/Activate.c
index 410782e60a93a9f59d20803408120be37fcf0508..e679c2ffed653847e0bb13fdb3a1d99843a6d161 100644 (file)
--- 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 86b8e057cd5d8254bdd6256902f3c4539e87ac84..5d5365ad8f2cd96b818d35643ab93c69e11ce952 100644 (file)
--- 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.  */