andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xkb: don't conditionally include xkb-config.h.

Browse Source 
If HAVE_XKB_CONFIG_H is ever undefined, we fail to build anyway.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2009-10-16 10:26:21 +10:00
parent 0b9dbd4bf2
commit ff3e171568
3 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xkb/Makefile.am
View File

@ -1,7 +1,6 @@
noinst_LTLIBRARIES = libxkb.la libxkbstubs.la
AM_CFLAGS = $(DIX_CFLAGS) \
-DHAVE_XKB_CONFIG_H
AM_CFLAGS = $(DIX_CFLAGS)
DDX_SRCS = \
ddxBeep.c \

2
xkb/ddxLoad.c
View File

@ -28,9 +28,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <dix-config.h>
#endif
#ifdef HAVE_XKB_CONFIG_H
#include <xkb-config.h>
#endif
#include <stdio.h>
#include <ctype.h>

2
xkb/xkbInit.c
View File

@ -28,9 +28,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <dix-config.h>
#endif
#ifdef HAVE_XKB_CONFIG_H
#include <xkb-config.h>
#endif
#include <stdio.h>
#include <stdlib.h>