From 9e6f87e20d8a9145be9faca0502b23de7809c5e4 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sun, 5 Nov 2017 02:02:58 +0100 Subject: Lift xkb to xorg-xserver-7.1/1.1.0 state In XORG-7_1 xkbconfig.c had been dropped. We must keep this file because it is used by hw/nxagent/Keyboard.c to load the xkb configuration file. Maybe we should move the relevant code to there or drop xkb configuration file support from nxagent. --- nx-X11/programs/Xserver/xkb/XKBGAlloc.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'nx-X11/programs/Xserver/xkb/XKBGAlloc.c') diff --git a/nx-X11/programs/Xserver/xkb/XKBGAlloc.c b/nx-X11/programs/Xserver/xkb/XKBGAlloc.c index 50e598280..bb46bbdcc 100644 --- a/nx-X11/programs/Xserver/xkb/XKBGAlloc.c +++ b/nx-X11/programs/Xserver/xkb/XKBGAlloc.c @@ -26,8 +26,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifdef HAVE_DIX_CONFIG_H #include -#elif defined(HAVE_CONFIG_H) -#include #endif -- cgit v1.2.3