From 3739a9b3033ccaf139a296f8647f7c6cddc9db75 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Mon, 26 Sep 2016 20:43:23 +0200
Subject: xserver: use own copy of XKBsrv.h header

just like upstream does
---
 nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
index 3bff638fb..45940db9a 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
@@ -75,6 +75,7 @@ is" without express or implied warranty.
 
 #define XKBSRV_NEED_FILE_FUNCS
 #include <nx-X11/extensions/XKBsrv.h>
+#include <nx-X11/extensions/XKBstr.h>
 #include <nx-X11/extensions/XKBconfig.h>
 
 #include <nx-X11/extensions/XKBrules.h>
-- 
cgit v1.2.3


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/hw/nxagent/Keyboard.c | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
index 45940db9a..3bff638fb 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
@@ -75,7 +75,6 @@ is" without express or implied warranty.
 
 #define XKBSRV_NEED_FILE_FUNCS
 #include <nx-X11/extensions/XKBsrv.h>
-#include <nx-X11/extensions/XKBstr.h>
 #include <nx-X11/extensions/XKBconfig.h>
 
 #include <nx-X11/extensions/XKBrules.h>
-- 
cgit v1.2.3


From 2a5364d5ff547e0a2447cbde4cd37da2fe69dece Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Mon, 26 Sep 2016 22:20:45 +0200
Subject: xserver: drop XKBSRV_NEED_FILE_FUNCS

just as upstream did
---
 nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
index 3bff638fb..5cb4ff4d9 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
@@ -73,12 +73,14 @@ is" without express or implied warranty.
 
 #include <nx-X11/extensions/XKB.h>
 
-#define XKBSRV_NEED_FILE_FUNCS
+/*
+  we need the client side header here, xkbsrv.h will not work because
+  server and libX11 have different struct sizes on
+  64bit. Interestingly upstream xnest does not take care of this.
+*/
 #include <nx-X11/extensions/XKBsrv.h>
 #include <nx-X11/extensions/XKBconfig.h>
 
-#include <nx-X11/extensions/XKBrules.h>
-
 #include "Xatom.h"
 
 #include <errno.h>
-- 
cgit v1.2.3