From 17f9321b3ef7aab3b8757ab04e9a493ccfcb8e88 Mon Sep 17 00:00:00 2001
From: Kaleb Keithley <kaleb@freedesktop.org>
Date: Sun, 30 Nov 2003 16:47:13 +0000
Subject: xfree86 merge

---
 XKBgeom.h |   9 -----
 XKBsrv.h  | 131 --------------------------------------------------------------
 2 files changed, 140 deletions(-)

diff --git a/XKBgeom.h b/XKBgeom.h
index b3f1336..f8f7e31 100644
--- a/XKBgeom.h
+++ b/XKBgeom.h
@@ -610,15 +610,6 @@ XkbSetGeometry(
 	XkbGeometryPtr		/* geom */
 );
 
-extern	Status
-XkbSetGeometry(
-#if NeedFunctionPrototypes
-	Display *		/* dpy */,
-	unsigned		/* deviceSpec */,
-	XkbGeometryPtr		/* geom */
-#endif
-);
-
 extern	Bool
 XkbComputeShapeTop(
 	XkbShapePtr		/* shape */,
diff --git a/XKBsrv.h b/XKBsrv.h
index 00b116a..bfbc7bc 100644
--- a/XKBsrv.h
+++ b/XKBsrv.h
@@ -885,14 +885,6 @@ extern int XkbDDXPrivate(
 	XkbAction *	/* act */
 );
 
-extern int XkbDDXPrivate(
-#if NeedFunctionPrototypes
-	DeviceIntPtr	/* dev */,
-	KeyCode		/* key */,
-	XkbAction *	/* act */
-#endif
-);
-
 extern void XkbDisableComputedAutoRepeats(
 	DeviceIntPtr 	/* pXDev */,
 	unsigned int	/* key */
@@ -1063,129 +1055,6 @@ extern void XkbSendNewKeyboardNotify(
 	xkbNewKeyboardNotify *	/* pNKN */
 );
 
-extern int XkbFinishDeviceInit(
-#if NeedFunctionPrototypes
-	DeviceIntPtr		/* pXDev */
-#endif
-);
-
-extern void XkbFreeSrvLedInfo(
-#if NeedFunctionPrototypes
-	XkbSrvLedInfoPtr	/* sli */
-#endif
-);
-
-extern void XkbFreeInfo(
-#if NeedFunctionPrototypes
-	XkbSrvInfoPtr		/* xkbi */
-#endif
-);
-
-extern Status XkbChangeTypesOfKey(
-#if NeedFunctionPrototypes
-	XkbDescPtr		/* xkb */,
-	int			/* key */,
-	int			/* nGroups */,
-	unsigned int		/* groups */,
-	int *			/* newTypesIn */,
-	XkbMapChangesPtr	/* changes */
-#endif
-);
-
-extern XkbKeyTypePtr XkbAddKeyType(
-#if NeedFunctionPrototypes
-	XkbDescPtr		/* xkb */,
-	Atom			/* name */,
-	int			/* map_count */,
-	Bool			/* want_preserve */,
-	int			/* num_lvls */
-#endif
-);
-
-extern Status XkbInitCanonicalKeyTypes(
-#if NeedFunctionPrototypes
-	XkbDescPtr		/* xkb */,
-	unsigned int		/* which */,
-	int			/* keypadVMod */
-#endif
-);
-
-extern int XkbKeyTypesForCoreSymbols(
-#if NeedFunctionPrototypes
-	XkbDescPtr		/* xkb */,
-	int			/* map_width */,
-	KeySym *		/* core_syms */,
-	unsigned int		/* protected */,
-	int *			/* types_inout */,
-	KeySym *		/* xkb_syms_rtrn */
-#endif
-);
-
-extern Bool XkbApplyCompatMapToKey(
-#if NeedFunctionPrototypes
-	XkbDescPtr		/* xkb */,
-	KeyCode			/* key */,
-	XkbChangesPtr		/* changes */
-#endif
-);
-
-extern Bool XkbUpdateMapFromCore(
-#if NeedFunctionPrototypes
-	XkbDescPtr		/* xkb */,
-	KeyCode			/* first_key */,
-	int			/* num_keys */,
-	int			/* map_width */,
-	KeySym *		/* core_keysyms */,
-	XkbChangesPtr		/* changes */
-#endif
-);
-
-extern void XkbFreeControls(
-#if NeedFunctionPrototypes
-	XkbDescPtr		/* xkb */,
-	unsigned int		/* which */,
-	Bool			/* freeMap */
-#endif
-);
-
-extern void XkbFreeIndicatorMaps(
-#if NeedFunctionPrototypes
-	XkbDescPtr		/* xkb */
-#endif
-);
-
-extern Bool XkbApplyVirtualModChanges(
-#if NeedFunctionPrototypes
-	XkbDescPtr		/* xkb */,
-	unsigned int		/* changed */,
-	XkbChangesPtr		/* changes */
-#endif
-);
-
-extern Bool XkbUpdateActionVirtualMods(
-#if NeedFunctionPrototypes
-	XkbDescPtr		/* xkb */,
-	XkbAction *		/* act */,
-	unsigned int		/* changed */
-#endif
-);
-
-extern void XkbUpdateKeyTypeVirtualMods(
-#if NeedFunctionPrototypes
-	XkbDescPtr		/* xkb */,
-	XkbKeyTypePtr		/* type */,
-	unsigned int		/* changed */,
-	XkbChangesPtr		/* changes */
-#endif
-);
-
-extern void XkbSendNewKeyboardNotify(
-#if NeedFunctionPrototypes
-	DeviceIntPtr		/* kbd */,
-	xkbNewKeyboardNotify *	/* pNKN */
-#endif
-);
-
 #ifdef XKBSRV_NEED_FILE_FUNCS
 
 #include <X11/extensions/XKMformat.h>
-- 
cgit v1.2.3