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 +++++---
 nx-X11/programs/Xserver/include/xkbsrv.h      | 2 --
 nx-X11/programs/Xserver/xkb/XKBMAlloc.c       | 1 -
 nx-X11/programs/Xserver/xkb/XKBMisc.c         | 1 -
 nx-X11/programs/Xserver/xkb/ddxConfig.c       | 1 -
 nx-X11/programs/Xserver/xkb/ddxList.c         | 1 -
 nx-X11/programs/Xserver/xkb/ddxLoad.c         | 1 -
 nx-X11/programs/Xserver/xkb/ddxPrivate.c      | 1 -
 nx-X11/programs/Xserver/xkb/maprules.c        | 1 -
 nx-X11/programs/Xserver/xkb/xkb.c             | 1 -
 nx-X11/programs/Xserver/xkb/xkbInit.c         | 1 -
 nx-X11/programs/Xserver/xkb/xkbUtils.c        | 1 -
 nx-X11/programs/Xserver/xkb/xkbconfig.c       | 1 -
 nx-X11/programs/Xserver/xkb/xkbfmisc.c        | 1 -
 nx-X11/programs/Xserver/xkb/xkbout.c          | 1 -
 nx-X11/programs/Xserver/xkb/xkbtext.c         | 1 -
 nx-X11/programs/Xserver/xkb/xkmread.c         | 1 -
 17 files changed, 5 insertions(+), 20 deletions(-)

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

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>
diff --git a/nx-X11/programs/Xserver/include/xkbsrv.h b/nx-X11/programs/Xserver/include/xkbsrv.h
index 8037562a4..f0f803370 100644
--- a/nx-X11/programs/Xserver/include/xkbsrv.h
+++ b/nx-X11/programs/Xserver/include/xkbsrv.h
@@ -1095,7 +1095,6 @@ extern void XkbSendNewKeyboardNotify(
 	xkbNewKeyboardNotify *	/* pNKN */
 );
 
-#ifdef XKBSRV_NEED_FILE_FUNCS
 
 #include <nx-X11/extensions/XKMformat.h>
 #include "xkbfile.h"
@@ -1177,7 +1176,6 @@ extern	int _XkbStrCaseCmp(
 	char *			/* str2 */
 );
 
-#endif /* XKBSRV_NEED_FILE_FUNCS */
 
 
 _XFUNCPROTOEND
diff --git a/nx-X11/programs/Xserver/xkb/XKBMAlloc.c b/nx-X11/programs/Xserver/xkb/XKBMAlloc.c
index ded43e983..66b20b89e 100644
--- a/nx-X11/programs/Xserver/xkb/XKBMAlloc.c
+++ b/nx-X11/programs/Xserver/xkb/XKBMAlloc.c
@@ -37,7 +37,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "misc.h"
 #include "inputstr.h"
 #include <nx-X11/keysym.h>
-#define	XKBSRV_NEED_FILE_FUNCS
 #include <xkbsrv.h>
 
 
diff --git a/nx-X11/programs/Xserver/xkb/XKBMisc.c b/nx-X11/programs/Xserver/xkb/XKBMisc.c
index 1366c49d1..68edfde74 100644
--- a/nx-X11/programs/Xserver/xkb/XKBMisc.c
+++ b/nx-X11/programs/Xserver/xkb/XKBMisc.c
@@ -37,7 +37,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "misc.h"
 #include "inputstr.h"
 #include <nx-X11/keysym.h>
-#define	XKBSRV_NEED_FILE_FUNCS
 #include <xkbsrv.h>
 
 
diff --git a/nx-X11/programs/Xserver/xkb/ddxConfig.c b/nx-X11/programs/Xserver/xkb/ddxConfig.c
index 2af180daa..1ecabd108 100644
--- a/nx-X11/programs/Xserver/xkb/ddxConfig.c
+++ b/nx-X11/programs/Xserver/xkb/ddxConfig.c
@@ -36,7 +36,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "scrnintstr.h"
 #include "windowstr.h"
 #include "os.h"
-#define	XKBSRV_NEED_FILE_FUNCS
 #include <xkbsrv.h>
 #include <nx-X11/extensions/XKBconfig.h>
 
diff --git a/nx-X11/programs/Xserver/xkb/ddxList.c b/nx-X11/programs/Xserver/xkb/ddxList.c
index e72e95957..6023366da 100644
--- a/nx-X11/programs/Xserver/xkb/ddxList.c
+++ b/nx-X11/programs/Xserver/xkb/ddxList.c
@@ -38,7 +38,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
-#define	XKBSRV_NEED_FILE_FUNCS
 #include <xkbsrv.h>
 #include <nx-X11/extensions/XI.h>
 
diff --git a/nx-X11/programs/Xserver/xkb/ddxLoad.c b/nx-X11/programs/Xserver/xkb/ddxLoad.c
index 0438fd359..dab94660d 100644
--- a/nx-X11/programs/Xserver/xkb/ddxLoad.c
+++ b/nx-X11/programs/Xserver/xkb/ddxLoad.c
@@ -49,7 +49,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
-#define	XKBSRV_NEED_FILE_FUNCS
 #include <xkbsrv.h>
 #include <nx-X11/extensions/XI.h>
 #include "xkb.h"
diff --git a/nx-X11/programs/Xserver/xkb/ddxPrivate.c b/nx-X11/programs/Xserver/xkb/ddxPrivate.c
index 16f2c5245..8fdc8c91f 100644
--- a/nx-X11/programs/Xserver/xkb/ddxPrivate.c
+++ b/nx-X11/programs/Xserver/xkb/ddxPrivate.c
@@ -10,7 +10,6 @@
 #include <stdio.h>
 #include <nx-X11/X.h>
 #include "windowstr.h"
-#define XKBSRV_NEED_FILE_FUNCS
 #include <xkbsrv.h>
 
 #ifdef XF86DDXACTIONS
diff --git a/nx-X11/programs/Xserver/xkb/maprules.c b/nx-X11/programs/Xserver/xkb/maprules.c
index 4db4f0083..c89cc528a 100644
--- a/nx-X11/programs/Xserver/xkb/maprules.c
+++ b/nx-X11/programs/Xserver/xkb/maprules.c
@@ -49,7 +49,6 @@
 #include "inputstr.h"
 #include "dix.h"
 #include "xkbstr.h"
-#define XKBSRV_NEED_FILE_FUNCS
 #include <xkbsrv.h>
 
 
diff --git a/nx-X11/programs/Xserver/xkb/xkb.c b/nx-X11/programs/Xserver/xkb/xkb.c
index 02d92b080..3e4cf4acd 100644
--- a/nx-X11/programs/Xserver/xkb/xkb.c
+++ b/nx-X11/programs/Xserver/xkb/xkb.c
@@ -33,7 +33,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <nx-X11/Xproto.h>
 #include "misc.h"
 #include "inputstr.h"
-#define	XKBSRV_NEED_FILE_FUNCS
 #include <xkbsrv.h>
 #include "extnsionst.h"
 #include "xkb.h"
diff --git a/nx-X11/programs/Xserver/xkb/xkbInit.c b/nx-X11/programs/Xserver/xkb/xkbInit.c
index aedfd6873..1d8283ffe 100644
--- a/nx-X11/programs/Xserver/xkb/xkbInit.c
+++ b/nx-X11/programs/Xserver/xkb/xkbInit.c
@@ -46,7 +46,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "opaque.h"
 #include "property.h"
 #include "scrnintstr.h"
-#define	XKBSRV_NEED_FILE_FUNCS
 #include <xkbsrv.h>
 #include "xkbgeom.h"
 #include <nx-X11/extensions/XKMformat.h>
diff --git a/nx-X11/programs/Xserver/xkb/xkbUtils.c b/nx-X11/programs/Xserver/xkb/xkbUtils.c
index 014e0f86a..b6a845c18 100644
--- a/nx-X11/programs/Xserver/xkb/xkbUtils.c
+++ b/nx-X11/programs/Xserver/xkb/xkbUtils.c
@@ -38,7 +38,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "misc.h"
 #include "inputstr.h"
 
-#define	XKBSRV_NEED_FILE_FUNCS
 #include <xkbsrv.h>
 #include "xkbgeom.h"
 #include "xkb.h"
diff --git a/nx-X11/programs/Xserver/xkb/xkbconfig.c b/nx-X11/programs/Xserver/xkb/xkbconfig.c
index b795dddb2..de138ef45 100644
--- a/nx-X11/programs/Xserver/xkb/xkbconfig.c
+++ b/nx-X11/programs/Xserver/xkb/xkbconfig.c
@@ -45,7 +45,6 @@
 #include "misc.h"
 #include "inputstr.h"
 #include "dix.h"
-#define	XKBSRV_NEED_FILE_FUNCS
 #include <xkbsrv.h>
 
 #include <nx-X11/extensions/XKBconfig.h>
diff --git a/nx-X11/programs/Xserver/xkb/xkbfmisc.c b/nx-X11/programs/Xserver/xkb/xkbfmisc.c
index 47a2dca21..43d55aa47 100644
--- a/nx-X11/programs/Xserver/xkb/xkbfmisc.c
+++ b/nx-X11/programs/Xserver/xkb/xkbfmisc.c
@@ -45,7 +45,6 @@
 #include "inputstr.h"
 #include "dix.h"
 #include "xkbstr.h"
-#define XKBSRV_NEED_FILE_FUNCS	1
 #include <xkbsrv.h>
 #include "xkbgeom.h"
 #include "xkb.h"
diff --git a/nx-X11/programs/Xserver/xkb/xkbout.c b/nx-X11/programs/Xserver/xkb/xkbout.c
index baad325c1..1e546d1cb 100644
--- a/nx-X11/programs/Xserver/xkb/xkbout.c
+++ b/nx-X11/programs/Xserver/xkb/xkbout.c
@@ -43,7 +43,6 @@
 #include "inputstr.h"
 #include "dix.h"
 #include "xkbstr.h"
-#define XKBSRV_NEED_FILE_FUNCS	1
 #include <xkbsrv.h>
 
 #include "xkbgeom.h"
diff --git a/nx-X11/programs/Xserver/xkb/xkbtext.c b/nx-X11/programs/Xserver/xkb/xkbtext.c
index cfb7eb865..d9888342e 100644
--- a/nx-X11/programs/Xserver/xkb/xkbtext.c
+++ b/nx-X11/programs/Xserver/xkb/xkbtext.c
@@ -43,7 +43,6 @@
 #include "inputstr.h"
 #include "dix.h"
 #include "xkbstr.h"
-#define XKBSRV_NEED_FILE_FUNCS	1
 #include <xkbsrv.h>
 #include "xkbgeom.h"
 
diff --git a/nx-X11/programs/Xserver/xkb/xkmread.c b/nx-X11/programs/Xserver/xkb/xkmread.c
index 490c67202..a48615beb 100644
--- a/nx-X11/programs/Xserver/xkb/xkmread.c
+++ b/nx-X11/programs/Xserver/xkb/xkmread.c
@@ -42,7 +42,6 @@
 #include "misc.h"
 #include "inputstr.h"
 #include "xkbstr.h"
-#define	 XKBSRV_NEED_FILE_FUNCS
 #include <xkbsrv.h>
 #include "xkbgeom.h"
 
-- 
cgit v1.2.3