aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2016-10-04 21:24:56 +0200
committerUlrich Sibiller <uli42@gmx.de>2016-10-06 21:16:17 +0200
commit736a2333e655ecfee78cb82f074cce5e84bdc218 (patch)
tree3dedb91af3a6a473d05b516eb7881065ca397ab7
parenta2a7482f2a38c86e6d9790a177dabdc02153e087 (diff)
downloadnx-libs-736a2333e655ecfee78cb82f074cce5e84bdc218.tar.gz
nx-libs-736a2333e655ecfee78cb82f074cce5e84bdc218.tar.bz2
nx-libs-736a2333e655ecfee78cb82f074cce5e84bdc218.zip
xserver: adapt xkbsrc includes syntax to match upstream
-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
-rw-r--r--nx-X11/programs/Xserver/os/utils.c2
-rw-r--r--nx-X11/programs/Xserver/xkb/xkmread.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/dix/devices.c b/nx-X11/programs/Xserver/dix/devices.c
index 53ba83bed..39f5d123f 100644
--- a/nx-X11/programs/Xserver/dix/devices.c
+++ b/nx-X11/programs/Xserver/dix/devices.c
@@ -62,7 +62,7 @@ SOFTWARE.
#include "dixstruct.h"
#include "site.h"
#ifdef XKB
-#include <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 aa647b063..d098afdc8 100644
--- a/nx-X11/programs/Xserver/dix/dispatch.c
+++ b/nx-X11/programs/Xserver/dix/dispatch.c
@@ -110,7 +110,7 @@ int ProcInitialConnection();
#endif
#ifdef XKB
#include "inputstr.h"
-#include <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 c0ddfe67b..166d2e85e 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 <xkbsrv.h>
+#include "xkbsrv.h"
extern Bool XkbFilterEvents(ClientPtr, int, xEvent *);
#endif
diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c
index f1f8f8d7f..8c69b1346 100644
--- a/nx-X11/programs/Xserver/os/utils.c
+++ b/nx-X11/programs/Xserver/os/utils.c
@@ -144,7 +144,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
#endif
#ifdef XKB
-#include <xkbsrv.h>
+#include "xkbsrv.h"
#endif
#ifdef XCSECURITY
#define _SECURITY_SERVER
diff --git a/nx-X11/programs/Xserver/xkb/xkmread.c b/nx-X11/programs/Xserver/xkb/xkmread.c
index a48615beb..18ab21dca 100644
--- a/nx-X11/programs/Xserver/xkb/xkmread.c
+++ b/nx-X11/programs/Xserver/xkb/xkmread.c
@@ -42,7 +42,7 @@
#include "misc.h"
#include "inputstr.h"
#include "xkbstr.h"
-#include <xkbsrv.h>
+#include "xkbsrv.h"
#include "xkbgeom.h"
Atom