xserver: drop XKBSRV_NEED_FILE_FUNCS

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>

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

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>
 
 

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>
 
 

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>
 

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>
 

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"

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

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>
 
 

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"

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>

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"

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>

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"

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"

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"
 

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"