Include <config.h> uniformly in oldXMenu sources.
* Activate.c, AddPane.c, AddSel.c, ChgPane.c, ChgSel.c, Create.c: * InsPane.c, InsSel.c, Internal.c, XMakeAssoc.c: Do not include <config.h>, since XMenuInt.h does that now. * XLookAssoc.c, XMenuInt.h: Include <config.h>. This avoids a build failure when configuring on Fedora 17 --with-x-toolkit=no, reported by Dmitry Andropov in <http://lists.gnu.org/archive/html/emacs-devel/2012-12/msg00078.html>.
This commit is contained in:
parent
aefa2ead35
commit
47a6e6df2b
13 changed files with 17 additions and 18 deletions
|
@ -95,7 +95,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|||
*
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
#include "XMenuInt.h"
|
||||
#include <X11/keysym.h>
|
||||
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
#include "XMenuInt.h"
|
||||
|
||||
int
|
||||
|
|
|
@ -13,7 +13,6 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
#include "XMenuInt.h"
|
||||
|
||||
int
|
||||
|
|
|
@ -1,3 +1,14 @@
|
|||
2012-12-04 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Include <config.h> uniformly in oldXMenu sources.
|
||||
* Activate.c, AddPane.c, AddSel.c, ChgPane.c, ChgSel.c, Create.c:
|
||||
* InsPane.c, InsSel.c, Internal.c, XMakeAssoc.c:
|
||||
Do not include <config.h>, since XMenuInt.h does that now.
|
||||
* XLookAssoc.c, XMenuInt.h: Include <config.h>.
|
||||
This avoids a build failure when configuring on Fedora 17
|
||||
--with-x-toolkit=no, reported by Dmitry Andropov in
|
||||
<http://lists.gnu.org/archive/html/emacs-devel/2012-12/msg00078.html>.
|
||||
|
||||
2012-10-06 Ulrich Müller <ulm@gentoo.org>
|
||||
|
||||
* Makefile.in (AR, ARFLAGS): Get values from configure.
|
||||
|
|
|
@ -13,7 +13,6 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
#include "XMenuInt.h"
|
||||
|
||||
int
|
||||
|
@ -65,4 +64,3 @@ XMenuChangePane(register XMenu *menu, register int p_num, char *label)
|
|||
_XMErrorCode = XME_NO_ERROR;
|
||||
return(p_num);
|
||||
}
|
||||
|
||||
|
|
|
@ -13,7 +13,6 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
#include "XMenuInt.h"
|
||||
|
||||
int
|
||||
|
@ -87,4 +86,3 @@ XMenuChangeSelection(Display *display, register XMenu *menu, register int p_num,
|
|||
_XMErrorCode = XME_NO_ERROR;
|
||||
return(s_num);
|
||||
}
|
||||
|
||||
|
|
|
@ -29,7 +29,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|||
*
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
#include "XMenuInt.h"
|
||||
#include <stdlib.h>
|
||||
|
||||
|
|
|
@ -14,7 +14,6 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
#include "XMenuInt.h"
|
||||
|
||||
int
|
||||
|
|
|
@ -13,7 +13,6 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
#include "XMenuInt.h"
|
||||
|
||||
int
|
||||
|
|
|
@ -29,7 +29,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|||
*
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
#include "XMenuInt.h"
|
||||
|
||||
/*
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include "copyright.h"
|
||||
|
||||
|
||||
#include <config.h>
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xresource.h>
|
||||
#include "X10.h"
|
||||
|
@ -18,10 +18,9 @@
|
|||
* in the table the routine will return a NULL pointer. All XId's are relative
|
||||
* to the currently active Display.
|
||||
*/
|
||||
caddr_t XLookUpAssoc(register Display *dpy, register XAssocTable *table, register XID x_id)
|
||||
|
||||
/* XAssocTable to search in. */
|
||||
/* XId to search for. */
|
||||
caddr_t XLookUpAssoc(Display *dpy,
|
||||
XAssocTable *table, /* XAssocTable to search in. */
|
||||
XID x_id) /* XId to search for. */
|
||||
{
|
||||
int hash;
|
||||
register XAssoc *bucket;
|
||||
|
@ -55,4 +54,3 @@ caddr_t XLookUpAssoc(register Display *dpy, register XAssocTable *table, registe
|
|||
/* It is apparently not in the table. */
|
||||
return(NULL);
|
||||
}
|
||||
|
||||
|
|
|
@ -3,7 +3,6 @@
|
|||
#include "copyright.h"
|
||||
|
||||
|
||||
#include <config.h>
|
||||
#include "XMenuInt.h"
|
||||
#include <X11/Xresource.h>
|
||||
#include <errno.h>
|
||||
|
|
|
@ -17,6 +17,8 @@
|
|||
#ifndef _XMenuInternal_h_
|
||||
#define _XMenuInternal_h_
|
||||
|
||||
#include <config.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. */
|
||||
|
|
Loading…
Add table
Reference in a new issue