From 2c31ce2f2a97a8dd358d95d3918c43d9474f3d16 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Mon, 26 Sep 2016 21:09:36 +0200
Subject: xserver: use own copy of XKBrules.h header

just like upstream does
---
 nx-X11/programs/Xserver/include/xkbsrv.h | 2 +-
 nx-X11/programs/Xserver/xkb/xkb.h        | 2 --
 nx-X11/programs/Xserver/xkb/xkbInit.c    | 2 +-
 nx-X11/programs/Xserver/xkb/xkbout.c     | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'nx-X11/programs')

diff --git a/nx-X11/programs/Xserver/include/xkbsrv.h b/nx-X11/programs/Xserver/include/xkbsrv.h
index fe2574eb6..8037562a4 100644
--- a/nx-X11/programs/Xserver/include/xkbsrv.h
+++ b/nx-X11/programs/Xserver/include/xkbsrv.h
@@ -1098,7 +1098,7 @@ extern void XkbSendNewKeyboardNotify(
 #ifdef XKBSRV_NEED_FILE_FUNCS
 
 #include <nx-X11/extensions/XKMformat.h>
-#include <nx-X11/extensions/XKBfile.h>
+#include "xkbfile.h"
 #include "xkbrules.h"
 
 #define	_XkbListKeymaps		0
diff --git a/nx-X11/programs/Xserver/xkb/xkb.h b/nx-X11/programs/Xserver/xkb/xkb.h
index aa2a97e18..7e5bc6488 100644
--- a/nx-X11/programs/Xserver/xkb/xkb.h
+++ b/nx-X11/programs/Xserver/xkb/xkb.h
@@ -1,7 +1,5 @@
 /* $XFree86$ */
 
-/* #include "XKBfile.h" */
-
 extern int ProcXkbUseExtension(ClientPtr client);
 extern int ProcXkbSelectEvents(ClientPtr client);
 extern int ProcXkbBell(ClientPtr client);
diff --git a/nx-X11/programs/Xserver/xkb/xkbInit.c b/nx-X11/programs/Xserver/xkb/xkbInit.c
index 8901acf0f..b19bfda33 100644
--- a/nx-X11/programs/Xserver/xkb/xkbInit.c
+++ b/nx-X11/programs/Xserver/xkb/xkbInit.c
@@ -50,7 +50,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <xkbsrv.h>
 #include <nx-X11/extensions/XKBgeom.h>
 #include <nx-X11/extensions/XKMformat.h>
-#include <nx-X11/extensions/XKBfile.h>
+#include "xkbfile.h"
 #include "xkb.h"
 
 #define	CREATE_ATOM(s)	MakeAtom(s,sizeof(s)-1,1)
diff --git a/nx-X11/programs/Xserver/xkb/xkbout.c b/nx-X11/programs/Xserver/xkb/xkbout.c
index 6057fa9d2..f2fb6e544 100644
--- a/nx-X11/programs/Xserver/xkb/xkbout.c
+++ b/nx-X11/programs/Xserver/xkb/xkbout.c
@@ -57,7 +57,7 @@
 #include <xkbsrv.h>
 
 #include <nx-X11/extensions/XKBgeom.h>
-#include <nx-X11/extensions/XKBfile.h>
+#include "xkbfile.h"
 
 #endif
 
-- 
cgit v1.2.3