Remove declarations of symbols that are never defined.

  These symbols were removed from the X Server, or never declared.
  One symbol that may need special attention is XkbBuildCoreState(),
that doesn't have a prototype anywhere, but is called from
xkb/xkbEvents.c:XkbFilterEvents(), and also used by the macros
XkbStateFieldFromRec() and XkbGrabStateFromRec() defined in
include/xkbstr.h.
  fb/wfbrename.h also may need some cleanup, as it makes several
"renames" of non existing symbols.

3 files changed, 0 insertions, 151 deletions

diff --git a/include/dix.h b/include/dix.h
index 66af953b2..1e3e78db1 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -169,8 +169,6 @@ extern void SendErrorToClient(
 extern void MarkClientException(
     ClientPtr /*client*/);
 
-extern void ddxBeforeReset (void);
-
 /* dixutils.c */
 
 extern void CopyISOLatin1Lowered(
@@ -381,10 +379,6 @@ extern int DeliverDeviceEvents(
 extern void DefineInitialRootWindow(
     WindowPtr /* win */);
 
-extern void SetupSprite(
-    DeviceIntPtr /* pDev */,
-    ScreenPtr    /* pScreen */);
-
 extern void InitializeSprite(
     DeviceIntPtr /* pDev */,
     WindowPtr    /* pWin */);
@@ -454,10 +448,6 @@ extern int GrabDevice(
     Bool /* coreGrab */);
 
 extern void InitEvents(void);
-extern void InitSprite(
-        DeviceIntPtr /* pDev */, 
-        Bool /* hasCursor */
-        );
 
 extern void CloseDownEvents(void);
 
diff --git a/include/xkbfile.h b/include/xkbfile.h
index 0a6cb18b9..c84f21dd4 100644
--- a/include/xkbfile.h
+++ b/include/xkbfile.h
@@ -76,11 +76,6 @@ typedef void	(*XkbFileAddOnFunc)(
 #define	_XkbErrXReqFailure		25
 #define	_XkbErrBadImplementation	26
 
-extern char *		_XkbErrMessages[];
-extern unsigned		_XkbErrCode;
-extern char *		_XkbErrLocation;
-extern unsigned		_XkbErrData;
-
 /***====================================================================***/
 
 _XFUNCPROTOBEGIN
@@ -149,16 +144,6 @@ extern char *	XkbIMWhichStateMaskText(
     unsigned	/* format */
 );
 
-extern char *	XkbAccessXDetailText(
-    unsigned	/* state */,
-    unsigned	/* format */
-);
-
-extern char *	XkbNKNDetailMaskText(
-    unsigned	/* detail */,
-    unsigned	/* format */
-);
-
 extern char *	XkbControlsMaskText(
     unsigned	/* ctrls */,
     unsigned	/* format */
@@ -212,14 +197,6 @@ extern	int	 XkbFindKeycodeByName(
     Bool	/* use_aliases */
 );
 
-extern	Bool	XkbLookupGroupAndLevel(
-    XkbDescPtr	/* xkb */,
-    int		/* key */,
-    int	*	/* mods_inout */,
-    int *	/* grp_inout */,
-    int	*	/* lvl_rtrn */
-);
-
 /***====================================================================***/
 
 extern	Atom	XkbInternAtom(
@@ -227,8 +204,6 @@ extern	Atom	XkbInternAtom(
     Bool	/* onlyIfExists */
 );
 
-extern	void	XkbInitAtoms(void);
-
 /***====================================================================***/
 
 #ifdef _XKBGEOM_H_
@@ -246,17 +221,6 @@ typedef struct _XkbDrawable {
 	struct _XkbDrawable *	next;
 } XkbDrawableRec,*XkbDrawablePtr; 
 
-extern	XkbDrawablePtr
-XkbGetOrderedDrawables(
-    XkbGeometryPtr	/* geom */,
-    XkbSectionPtr	/* section */
-);
-
-extern	void
-XkbFreeOrderedDrawables(
-    XkbDrawablePtr	/* draw */
-);
-
 #endif
 
 /***====================================================================***/
@@ -266,11 +230,6 @@ extern	unsigned	XkbConvertGetByNameComponents(
     unsigned 		/* orig */
 );
 
-extern	unsigned	XkbConvertXkbComponents(
-    Bool		/* toXkm */,
-    unsigned 		/* orig */
-);
-
 extern	Bool	XkbNameMatchesPattern(
     char *		/* name */,
     char *		/* pattern */
@@ -323,56 +282,6 @@ extern	Bool	XkbWriteXKBGeometry(
     void *		/* priv */
 );
 
-extern	Bool	XkbWriteXKBSemantics(
-    FILE *		/* file */,
-    XkbDescPtr	/* result */,
-    Bool		/* topLevel */,
-    Bool		/* showImplicit */,
-    XkbFileAddOnFunc	/* addOn */,
-    void *		/* priv */
-);
-
-extern	Bool	XkbWriteXKBLayout(
-    FILE *		/* file */,
-    XkbDescPtr	/* result */,
-    Bool		/* topLevel */,
-    Bool		/* showImplicit */,
-    XkbFileAddOnFunc	/* addOn */,
-    void *		/* priv */
-);
-
-extern	Bool	XkbWriteXKBKeymap(
-    FILE *		/* file */,
-    XkbDescPtr	/* result */,
-    Bool		/* topLevel */,
-    Bool		/* showImplicit */,
-    XkbFileAddOnFunc	/* addOn */,
-    void *		/* priv */
-);
-
-extern	Bool	XkbWriteXKBFile(
-    FILE *		/* file */,
-    XkbDescPtr	/* result */,
-    Bool		/* showImplicit */,
-    XkbFileAddOnFunc	/* addOn */,
-    void *		/* priv */
-);
-
-extern	Bool	XkbWriteCFile(
-    FILE *		/* file */,
-    char *		/* name */,
-    XkbDescPtr	/* info */
-);
-
-extern	Bool	XkbWriteXKMFile(
-    FILE *		/* file */,
-    XkbDescPtr	/* result */
-);
-
-extern	Bool	XkbWriteToServer(
-    XkbDescPtr	/* result */
-);
-
 extern	void	XkbEnsureSafeMapName(
     char *		/* name */
 );
@@ -385,10 +294,6 @@ extern	Bool	XkbWriteXKBKeymapForNames(
     unsigned			/* need */
 );
 
-extern	Status	XkbMergeFile(
-    XkbDescPtr			/* xkb */
-);
-
 /***====================================================================***/
 
 extern Bool	XkmProbe(
@@ -411,24 +316,6 @@ extern Bool	XkmReadTOC(
     xkmSectionInfo *    /* toc */
 );
 
-extern xkmSectionInfo *XkmFindTOCEntry(
-    xkmFileInfo *       /* finfo */,
-    xkmSectionInfo *    /* toc */,
-    unsigned            /* type */
-);
-
-extern Bool	XkmReadFileSection(
-    FILE *              /* file */,
-    xkmSectionInfo *    /* toc */,
-    XkbDescPtr       /* result */,
-    unsigned *          /* loaded_rtrn */
-);
-
-extern char *	XkmReadFileSectionName(
-    FILE *		/* file */,
-    xkmSectionInfo *	/* toc */
-);
-
 #endif /* _XKMFORMAT_H  */
 
 _XFUNCPROTOEND
diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index d43755e06..32661a931 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -295,8 +295,6 @@ extern int	XkbDisableLockActions;
 extern int	XkbKeyboardErrorCode;
 extern char *	XkbBaseDirectory;
 extern char *	XkbBinDirectory;
-extern char *	XkbInitialMap;
-extern unsigned	int XkbXIUnsupported;
 
 extern Bool	noXkbExtension;
 
@@ -484,12 +482,6 @@ extern  void XkbSetActionKeyMods(
 	unsigned int 		/* mods */
 );
 
-extern Bool XkbCheckActionVMods(
-	XkbDescPtr		/* xkb */,
-	XkbAction *		/* act */,
-	unsigned int 		/* changed */
-);
-
 extern	unsigned int XkbMaskForVMask(
     XkbDescPtr		/* xkb */,
     unsigned int	/* vmask */
@@ -705,11 +697,6 @@ extern	void XkbSendNamesNotify(
        xkbNamesNotify *	/* ev */
 );
 
-extern	void XkbSendCompatNotify(
-       DeviceIntPtr		/* kbd */,
-       xkbCompatMapNotify *	/* ev */
-);
-
 extern	void XkbSendActionMessage(
        DeviceIntPtr		/* kbd */,
        xkbActionMessage *	/* ev */
@@ -827,11 +814,6 @@ extern void XkbDDXUpdateDeviceIndicators(
 	CARD32			/* newState */
 );
 
-extern void XkbDDXFakePointerButton(
-	int 		/* event */,
-	int		/* button */
-);
-
 extern void XkbDDXFakePointerMotion(
  	unsigned int	/* flags */,
 	int		/* x */,
@@ -1037,16 +1019,6 @@ extern	Bool XkbDDXNamesFromRules(
 	XkbComponentNamesPtr	/* names */
 );
 
-extern	Bool XkbDDXApplyConfig(
-	void *	/* cfg_in */,
-	XkbSrvInfoPtr	/* xkbi */
-);
-
-extern	int _XkbStrCaseCmp(
-	char *			/* str1 */,
-	char *			/* str2 */
-);
-
 _XFUNCPROTOEND
 
 #define	XkbAtomGetString(s)	NameForAtom(s)