From 3b8819087e6dafa5ab537a9b8a6bce49ef0ae1a5 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Mon, 26 Sep 2016 21:03:02 +0200
Subject: xserver: use own copy of XKBstr.h header

just like upstream does
---
 nx-X11/programs/Xserver/xkb/maprules.c | 2 +-
 nx-X11/programs/Xserver/xkb/xkbSwap.c  | 2 +-
 nx-X11/programs/Xserver/xkb/xkbfmisc.c | 2 +-
 nx-X11/programs/Xserver/xkb/xkbout.c   | 2 +-
 nx-X11/programs/Xserver/xkb/xkbtext.c  | 2 +-
 nx-X11/programs/Xserver/xkb/xkmread.c  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'nx-X11/programs/Xserver/xkb')

diff --git a/nx-X11/programs/Xserver/xkb/maprules.c b/nx-X11/programs/Xserver/xkb/maprules.c
index 0cf2731d7..5ffa5aa03 100644
--- a/nx-X11/programs/Xserver/xkb/maprules.c
+++ b/nx-X11/programs/Xserver/xkb/maprules.c
@@ -63,7 +63,7 @@
 #include "misc.h"
 #include "inputstr.h"
 #include "dix.h"
-#include <nx-X11/extensions/XKBstr.h>
+#include "xkbstr.h"
 #define XKBSRV_NEED_FILE_FUNCS
 #include <xkbsrv.h>
 
diff --git a/nx-X11/programs/Xserver/xkb/xkbSwap.c b/nx-X11/programs/Xserver/xkb/xkbSwap.c
index f502fc635..ed5b2ff04 100644
--- a/nx-X11/programs/Xserver/xkb/xkbSwap.c
+++ b/nx-X11/programs/Xserver/xkb/xkbSwap.c
@@ -34,7 +34,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "misc.h"
 #include "inputstr.h"
 #include <xkbsrv.h>
-#include <nx-X11/extensions/XKBstr.h>
+#include "xkbstr.h"
 #include "extnsionst.h"
 #include "xkb.h"
 
diff --git a/nx-X11/programs/Xserver/xkb/xkbfmisc.c b/nx-X11/programs/Xserver/xkb/xkbfmisc.c
index 5de2650d6..d88162125 100644
--- a/nx-X11/programs/Xserver/xkb/xkbfmisc.c
+++ b/nx-X11/programs/Xserver/xkb/xkbfmisc.c
@@ -54,7 +54,7 @@
 #include "misc.h"
 #include "inputstr.h"
 #include "dix.h"
-#include <nx-X11/extensions/XKBstr.h>
+#include "xkbstr.h"
 #define XKBSRV_NEED_FILE_FUNCS	1
 #include <xkbsrv.h>
 #include <nx-X11/extensions/XKBgeom.h>
diff --git a/nx-X11/programs/Xserver/xkb/xkbout.c b/nx-X11/programs/Xserver/xkb/xkbout.c
index ada54f9a3..6057fa9d2 100644
--- a/nx-X11/programs/Xserver/xkb/xkbout.c
+++ b/nx-X11/programs/Xserver/xkb/xkbout.c
@@ -52,7 +52,7 @@
 #include "misc.h"
 #include "inputstr.h"
 #include "dix.h"
-#include <nx-X11/extensions/XKBstr.h>
+#include "xkbstr.h"
 #define XKBSRV_NEED_FILE_FUNCS	1
 #include <xkbsrv.h>
 
diff --git a/nx-X11/programs/Xserver/xkb/xkbtext.c b/nx-X11/programs/Xserver/xkb/xkbtext.c
index 7f6182169..81f508931 100644
--- a/nx-X11/programs/Xserver/xkb/xkbtext.c
+++ b/nx-X11/programs/Xserver/xkb/xkbtext.c
@@ -52,7 +52,7 @@
 #include "misc.h"
 #include "inputstr.h"
 #include "dix.h"
-#include <nx-X11/extensions/XKBstr.h>
+#include "xkbstr.h"
 #define XKBSRV_NEED_FILE_FUNCS	1
 #include <xkbsrv.h>
 #include <nx-X11/extensions/XKBgeom.h>
diff --git a/nx-X11/programs/Xserver/xkb/xkmread.c b/nx-X11/programs/Xserver/xkb/xkmread.c
index 068b206f1..dfb7d490b 100644
--- a/nx-X11/programs/Xserver/xkb/xkmread.c
+++ b/nx-X11/programs/Xserver/xkb/xkmread.c
@@ -54,7 +54,7 @@
 #include <nx-X11/keysym.h>
 #include "misc.h"
 #include "inputstr.h"
-#include <nx-X11/extensions/XKBstr.h>
+#include "xkbstr.h"
 #define	 XKBSRV_NEED_FILE_FUNCS
 #include <xkbsrv.h>
 #include <nx-X11/extensions/XKBgeom.h>
-- 
cgit v1.2.3