Switched to xorg-server-1.6.99.900.tar.gz

1 files changed, 33 insertions, 130 deletions

diff --git a/xorg-server/include/xkbfile.h b/xorg-server/include/xkbfile.h
index 948d6ca4a..a4b99ee07 100644
--- a/xorg-server/include/xkbfile.h
+++ b/xorg-server/include/xkbfile.h
@@ -27,6 +27,8 @@
 #ifndef _XKBFILE_H_
 #define	_XKBFILE_H_ 1
 
+#include "xkbstr.h"
+
 /***====================================================================***/
 
 #define	XkbXKMFile	0
@@ -76,116 +78,101 @@ typedef void	(*XkbFileAddOnFunc)(
 #define	_XkbErrXReqFailure		25
 #define	_XkbErrBadImplementation	26
 
-extern char *		_XkbErrMessages[];
-extern unsigned		_XkbErrCode;
-extern char *		_XkbErrLocation;
-extern unsigned		_XkbErrData;
-
 /***====================================================================***/
 
 _XFUNCPROTOBEGIN
 
-extern	char *	XkbIndentText(
+extern _X_EXPORT char *	XkbIndentText(
     unsigned	/* size */
 );
 
-extern	char *	XkbAtomText(
+extern _X_EXPORT char *	XkbAtomText(
     Atom 	/* atm */,
     unsigned	/* format */
 );
 
-extern char *	XkbKeysymText(
+extern _X_EXPORT char *	XkbKeysymText(
     KeySym	/* sym */,
     unsigned	/* format */
 );
 
-extern char *	XkbStringText(
+extern _X_EXPORT char *	XkbStringText(
     char *	/* str */,
     unsigned	/* format */
 );
 
-extern char *	XkbKeyNameText(
+extern _X_EXPORT char *	XkbKeyNameText(
     char *	/* name */,
     unsigned	/* format */
 );
 
-extern char *
+extern _X_EXPORT char *
 XkbModIndexText(
     unsigned	/* ndx */,
     unsigned	/* format */
 );
 
-extern char *
+extern _X_EXPORT char *
 XkbModMaskText(
     unsigned	/* mask */,
     unsigned	/* format */
 );
 
-extern char *	XkbVModIndexText(
+extern _X_EXPORT char *	XkbVModIndexText(
     XkbDescPtr	/* xkb */,
     unsigned	/* ndx */,
     unsigned	/* format */
 );
 
-extern	char *	XkbVModMaskText(
+extern _X_EXPORT char *	XkbVModMaskText(
     XkbDescPtr	/* xkb */,
     unsigned	/* modMask */,
     unsigned	/* mask */,
     unsigned	/* format */
 );
 
-extern char *	XkbConfigText(
+extern _X_EXPORT char *	XkbConfigText(
     unsigned 	/* config */,
     unsigned 	/* format */
 );
 
-extern char *	XkbSIMatchText(
+extern _X_EXPORT char *	XkbSIMatchText(
     unsigned	/* type */,
     unsigned	/* format */
 );
 
-extern char *	XkbIMWhichStateMaskText(
+extern _X_EXPORT char *	XkbIMWhichStateMaskText(
     unsigned	/* use_which */,
     unsigned	/* format */
 );
 
-extern char *	XkbAccessXDetailText(
-    unsigned	/* state */,
-    unsigned	/* format */
-);
-
-extern char *	XkbNKNDetailMaskText(
-    unsigned	/* detail */,
-    unsigned	/* format */
-);
-
-extern char *	XkbControlsMaskText(
+extern _X_EXPORT char *	XkbControlsMaskText(
     unsigned	/* ctrls */,
     unsigned	/* format */
 );
 
-extern char *	XkbGeomFPText(
+extern _X_EXPORT char *	XkbGeomFPText(
     int		/* val */,
     unsigned 	/* format */
 );
 
-extern char *	XkbDoodadTypeText(
+extern _X_EXPORT char *	XkbDoodadTypeText(
     unsigned	/* type */,
     unsigned	/* format */
 );
 
-extern char *	XkbActionTypeText(
+extern _X_EXPORT char *	XkbActionTypeText(
     unsigned	/* type */,
     unsigned	/* format */
 );
 
-extern char *	XkbActionText(
+extern _X_EXPORT char *	XkbActionText(
     XkbDescPtr	/* xkb */,
     XkbAction *	/* action */,
     unsigned	/* format */
 );
 
-extern char *	XkbBehaviorText(
+extern _X_EXPORT char *	XkbBehaviorText(
     XkbDescPtr 		/* xkb */,
     XkbBehavior *	/* behavior */,
     unsigned		/* format */
@@ -202,33 +189,23 @@ extern char *	XkbBehaviorText(
 #define	XkbKSIsDeadKey(k)	\
 		(((k)>=XK_dead_grave)&&((k)<=XK_dead_semivoiced_sound))
 
-extern	unsigned _XkbKSCheckCase(
+extern _X_EXPORT unsigned _XkbKSCheckCase(
    KeySym	/* sym */
 );
 
-extern	int	 XkbFindKeycodeByName(
+extern _X_EXPORT int	 XkbFindKeycodeByName(
     XkbDescPtr	/* xkb */,
     char *	/* name */,
     Bool	/* use_aliases */
 );
 
-extern	Bool	XkbLookupGroupAndLevel(
-    XkbDescPtr	/* xkb */,
-    int		/* key */,
-    int	*	/* mods_inout */,
-    int *	/* grp_inout */,
-    int	*	/* lvl_rtrn */
-);
-
 /***====================================================================***/
 
-extern	Atom	XkbInternAtom(
+extern _X_EXPORT Atom	XkbInternAtom(
     char *	/* name */,
     Bool	/* onlyIfExists */
 );
 
-extern	void	XkbInitAtoms(void);
-
 /***====================================================================***/
 
 #ifdef _XKBGEOM_H_
@@ -246,39 +223,23 @@ typedef struct _XkbDrawable {
 	struct _XkbDrawable *	next;
 } XkbDrawableRec,*XkbDrawablePtr; 
 
-extern	XkbDrawablePtr
-XkbGetOrderedDrawables(
-    XkbGeometryPtr	/* geom */,
-    XkbSectionPtr	/* section */
-);
-
-extern	void
-XkbFreeOrderedDrawables(
-    XkbDrawablePtr	/* draw */
-);
-
 #endif
 
 /***====================================================================***/
 
-extern	unsigned	XkbConvertGetByNameComponents(
+extern _X_EXPORT unsigned	XkbConvertGetByNameComponents(
     Bool		/* toXkm */,
     unsigned 		/* orig */
 );
 
-extern	unsigned	XkbConvertXkbComponents(
-    Bool		/* toXkm */,
-    unsigned 		/* orig */
-);
-
-extern	Bool	XkbNameMatchesPattern(
+extern _X_EXPORT Bool	XkbNameMatchesPattern(
     char *		/* name */,
     char *		/* pattern */
 );
 
 /***====================================================================***/
 
-extern	Bool	XkbWriteXKBKeycodes(
+extern _X_EXPORT Bool	XkbWriteXKBKeycodes(
     FILE *		/* file */,
     XkbDescPtr          /* result */,
     Bool		/* topLevel */,
@@ -287,7 +248,7 @@ extern	Bool	XkbWriteXKBKeycodes(
     void *		/* priv */
 );
 
-extern	Bool	XkbWriteXKBKeyTypes(
+extern _X_EXPORT Bool	XkbWriteXKBKeyTypes(
     FILE *		/* file */,
     XkbDescPtr  	/* result */,
     Bool		/* topLevel */,
@@ -296,34 +257,7 @@ extern	Bool	XkbWriteXKBKeyTypes(
     void *		/* priv */
 );
 
-extern	Bool	XkbWriteXKBCompatMap(
-    FILE *		/* file */,
-    XkbDescPtr	/* result */,
-    Bool		/* topLevel */,
-    Bool		/* showImplicit */,
-    XkbFileAddOnFunc	/* addOn */,
-    void *		/* priv */
-);
-
-extern	Bool	XkbWriteXKBSymbols(
-    FILE *		/* file */,
-    XkbDescPtr	/* result */,
-    Bool		/* topLevel */,
-    Bool		/* showImplicit */,
-    XkbFileAddOnFunc	/* addOn */,
-    void *		/* priv */
-);
-
-extern	Bool	XkbWriteXKBGeometry(
-    FILE *		/* file */,
-    XkbDescPtr	/* result */,
-    Bool		/* topLevel */,
-    Bool		/* showImplicit */,
-    XkbFileAddOnFunc	/* addOn */,
-    void *		/* priv */
-);
-
-extern	Bool	XkbWriteXKBSemantics(
+extern _X_EXPORT Bool	XkbWriteXKBCompatMap(
     FILE *		/* file */,
     XkbDescPtr	/* result */,
     Bool		/* topLevel */,
@@ -332,7 +266,7 @@ extern	Bool	XkbWriteXKBSemantics(
     void *		/* priv */
 );
 
-extern	Bool	XkbWriteXKBLayout(
+extern _X_EXPORT Bool	XkbWriteXKBSymbols(
     FILE *		/* file */,
     XkbDescPtr	/* result */,
     Bool		/* topLevel */,
@@ -341,7 +275,7 @@ extern	Bool	XkbWriteXKBLayout(
     void *		/* priv */
 );
 
-extern	Bool	XkbWriteXKBKeymap(
+extern _X_EXPORT Bool	XkbWriteXKBGeometry(
     FILE *		/* file */,
     XkbDescPtr	/* result */,
     Bool		/* topLevel */,
@@ -350,34 +284,7 @@ extern	Bool	XkbWriteXKBKeymap(
     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 */
-);
-
-extern	Bool	XkbWriteXKBKeymapForNames(
+extern _X_EXPORT Bool	XkbWriteXKBKeymapForNames(
     FILE *			/* file */,
     XkbComponentNamesPtr	/* names */,
     XkbDescPtr			/* xkb */,
@@ -385,17 +292,13 @@ extern	Bool	XkbWriteXKBKeymapForNames(
     unsigned			/* need */
 );
 
-extern	Status	XkbMergeFile(
-    XkbDescPtr			/* xkb */
-);
-
 /***====================================================================***/
 
-extern Bool	XkmProbe(
+extern _X_EXPORT Bool	XkmProbe(
     FILE *		/* file */
 );
 
-extern unsigned	XkmReadFile(
+extern _X_EXPORT unsigned	XkmReadFile(
     FILE *		/* file */,
     unsigned		/* need */,
     unsigned		/* want */,