aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/dix
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2016-09-26 20:43:23 +0200
committerUlrich Sibiller <uli42@gmx.de>2016-10-06 21:16:16 +0200
commit3739a9b3033ccaf139a296f8647f7c6cddc9db75 (patch)
tree97564c0024afe67e9685a6c810197660c4b31bd2 /nx-X11/programs/Xserver/dix
parentf0c0ff41bdb9b4f83703548f2a4076317115aeb3 (diff)
downloadnx-libs-3739a9b3033ccaf139a296f8647f7c6cddc9db75.tar.gz
nx-libs-3739a9b3033ccaf139a296f8647f7c6cddc9db75.tar.bz2
nx-libs-3739a9b3033ccaf139a296f8647f7c6cddc9db75.zip
xserver: use own copy of XKBsrv.h header
just like upstream does
Diffstat (limited to 'nx-X11/programs/Xserver/dix')
-rw-r--r--nx-X11/programs/Xserver/dix/devices.c2
-rw-r--r--nx-X11/programs/Xserver/dix/dispatch.c2
-rw-r--r--nx-X11/programs/Xserver/dix/events.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/dix/devices.c b/nx-X11/programs/Xserver/dix/devices.c
index f02da7d21..1c4e71f23 100644
--- a/nx-X11/programs/Xserver/dix/devices.c
+++ b/nx-X11/programs/Xserver/dix/devices.c
@@ -63,7 +63,7 @@ SOFTWARE.
#include "site.h"
#define XKB_IN_SERVER
#ifdef XKB
-#include <nx-X11/extensions/XKBsrv.h>
+#include <xkbsrv.h>
#endif
#ifdef XCSECURITY
#define _SECURITY_SERVER
diff --git a/nx-X11/programs/Xserver/dix/dispatch.c b/nx-X11/programs/Xserver/dix/dispatch.c
index 3017c68d1..87d753612 100644
--- a/nx-X11/programs/Xserver/dix/dispatch.c
+++ b/nx-X11/programs/Xserver/dix/dispatch.c
@@ -111,7 +111,7 @@ int ProcInitialConnection();
#ifdef XKB
#define XKB_IN_SERVER
#include "inputstr.h"
-#include <nx-X11/extensions/XKBsrv.h>
+#include <xkbsrv.h>
#endif
#define mskcnt ((MAXCLIENTS + 31) / 32)
diff --git a/nx-X11/programs/Xserver/dix/events.c b/nx-X11/programs/Xserver/dix/events.c
index f85bacdd3..c0ddfe67b 100644
--- a/nx-X11/programs/Xserver/dix/events.c
+++ b/nx-X11/programs/Xserver/dix/events.c
@@ -129,7 +129,7 @@ of the copyright holder.
#include "globals.h"
#ifdef XKB
-#include <nx-X11/extensions/XKBsrv.h>
+#include <xkbsrv.h>
extern Bool XkbFilterEvents(ClientPtr, int, xEvent *);
#endif