mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-05 22:20:24 -08:00
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.
This commit is contained in:
parent
0d0703e9c4
commit
5c13c33e0c
2 changed files with 4 additions and 5 deletions
|
|
@ -615,8 +615,8 @@ XMenuActivate(
|
||||||
event.xbutton.window
|
event.xbutton.window
|
||||||
);
|
);
|
||||||
if (event_xmp != NULL) continue;
|
if (event_xmp != NULL) continue;
|
||||||
|
FALLTHROUGH;
|
||||||
queue:
|
default:
|
||||||
/*
|
/*
|
||||||
* This is a foreign event.
|
* This is a foreign event.
|
||||||
* Queue it for later return to the X event queue.
|
* Queue it for later return to the X event queue.
|
||||||
|
|
@ -629,9 +629,6 @@ XMenuActivate(
|
||||||
feq_tmp->event = event;
|
feq_tmp->event = event;
|
||||||
feq_tmp->next = feq;
|
feq_tmp->next = feq;
|
||||||
feq = feq_tmp;
|
feq = feq_tmp;
|
||||||
break;
|
|
||||||
default:
|
|
||||||
goto queue;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
|
|
|
||||||
|
|
@ -37,6 +37,8 @@ without express or implied warranty.
|
||||||
|
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
|
|
||||||
|
#include <attribute.h>
|
||||||
|
|
||||||
/* Avoid warnings about redefining NULL by including <stdio.h> first;
|
/* Avoid warnings about redefining NULL by including <stdio.h> first;
|
||||||
the other file which wants to define it (<stddef.h> on Ultrix
|
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. */
|
systems) can deal if NULL is already defined, but <stdio.h> can't. */
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue