Merge branch 'uli42-pr/various4' into 3.6.x

Attributes GH PR #896: https://github.com/ArcticaProject/nx-libs/pull/896

1 files changed, 0 insertions, 90 deletions

diff --git a/nx-X11/include/extensions/XKBsrv.h b/nx-X11/include/extensions/XKBsrv.h
index db9c1d59e..6d369e2b2 100644
--- a/nx-X11/include/extensions/XKBsrv.h
+++ b/nx-X11/include/extensions/XKBsrv.h
@@ -70,11 +70,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <nx-X11/extensions/XKBproto.h>
 #include "inputstr.h"
 
-#ifdef NXAGENT_SERVER
-extern char *_NXGetXkbBasePath(const char *path);
-extern char *_NXGetXkbCompPath(const char *path);
-#endif
-
 typedef struct _XkbInterest {
 	DeviceIntPtr		dev;
 	ClientPtr		client;
@@ -1111,91 +1106,6 @@ extern void XkbSendNewKeyboardNotify(
 	xkbNewKeyboardNotify *	/* pNKN */
 );
 
-#ifdef XKBSRV_NEED_FILE_FUNCS
-
-#include <nx-X11/extensions/XKMformat.h>
-#include <nx-X11/extensions/XKBfile.h>
-#include <nx-X11/extensions/XKBrules.h>
-
-#define	_XkbListKeymaps		0
-#define	_XkbListKeycodes	1
-#define	_XkbListTypes		2
-#define	_XkbListCompat		3
-#define	_XkbListSymbols		4
-#define	_XkbListGeometry	5
-#define	_XkbListNumComponents	6
-
-typedef struct _XkbSrvListInfo {
-	int		szPool;
-	int		nPool;
-	char *		pool;
-
-	int		maxRtrn;
-	int		nTotal;
-
-	char *		pattern[_XkbListNumComponents];
-	int		nFound[_XkbListNumComponents];
-} XkbSrvListInfoRec,*XkbSrvListInfoPtr;
-
-char *
-XkbGetRulesDflts(
-	XkbRF_VarDefsPtr	/* defs */
-);
-
-extern void	XkbSetRulesUsed(
-	XkbRF_VarDefsPtr	/* defs */
-);
-
-
-extern	Status	XkbDDXList(
-	DeviceIntPtr		/* dev */,
-	XkbSrvListInfoPtr	/* listing */,
-	ClientPtr		/* client */
-);
-
-extern	unsigned int XkbDDXLoadKeymapByNames(
-	DeviceIntPtr		/* keybd */,
-	XkbComponentNamesPtr	/* names */,
-	unsigned int		/* want */,
-	unsigned int		/* need */,
-	XkbFileInfoPtr		/* finfoRtrn */,
-	char *			/* keymapNameRtrn */,
-	int 			/* keymapNameRtrnLen */
-);
-
-extern	Bool XkbDDXNamesFromRules(
-	DeviceIntPtr		/* keybd */,
-	char *			/* rules */,
-	XkbRF_VarDefsPtr	/* defs */,
-	XkbComponentNamesPtr	/* names */
-);
-
-extern	FILE *XkbDDXOpenConfigFile(
-	char *	/* mapName */,
-	char *	/* fileNameRtrn */,
-	int	/* fileNameRtrnLen */
-);
-
-extern	Bool XkbDDXApplyConfig(
-	XPointer	/* cfg_in */,
-	XkbSrvInfoPtr	/* xkbi */
-);
-
-extern XPointer XkbDDXPreloadConfig(
-	char **			/* rulesFileRtrn */,
-	XkbRF_VarDefsPtr	/* defs */,
-	XkbComponentNamesPtr	/* names */,
-	DeviceIntPtr		/* dev */
-);
-
-extern	int _XkbStrCaseCmp(
-	char *			/* str1 */,
-	char *			/* str2 */
-);
-
-#endif /* XKBSRV_NEED_FILE_FUNCS */
-
-
 _XFUNCPROTOEND
 
 #define	XkbAtomGetString(d,s)	NameForAtom(s)