XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_16

1 files changed, 1 insertions, 97 deletions

diff --git a/xkb/XKBMisc.c b/xkb/XKBMisc.c
index f3de9295e..06660ff89 100644
--- a/xkb/XKBMisc.c
+++ b/xkb/XKBMisc.c
@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/X11/XKBMisc.c,v 3.5 2001/10/28 03:32:33 tsi Exp $ */
+/* $XFree86: xc/lib/X11/XKBMisc.c,v 3.6 2003/11/17 22:20:09 dawes Exp $ */
 
 #ifndef XKB_IN_SERVER
 
@@ -102,14 +102,7 @@ static	XkbKeyTypeRec	canonicalTypes[XkbNumRequiredTypes] = {
 };
 
 Status
-#if NeedFunctionPrototypes
 XkbInitCanonicalKeyTypes(XkbDescPtr xkb,unsigned which,int keypadVMod)
-#else
-XkbInitCanonicalKeyTypes(xkb,which,keypadVMod)
-    XkbDescPtr		xkb;
-    unsigned		which;
-    int			keypadVMod;
-#endif
 {
 XkbClientMapPtr	map;
 XkbKeyTypePtr	from,to;
@@ -159,23 +152,12 @@ Status		rtrn;
 #define	XKB_OFFSET(g,l)	(((g)*groupsWidth)+(l))
 
 int
-#if NeedFunctionPrototypes
 XkbKeyTypesForCoreSymbols(	XkbDescPtr	xkb,
 				int		map_width,
 				KeySym *	core_syms,
 				unsigned int 	protected,
     				int *		types_inout,
 				KeySym *	xkb_syms_rtrn)
-#else
-XkbKeyTypesForCoreSymbols(xkb,map_width,core_syms,protected,types_inout,
-								xkb_syms_rtrn)
-    XkbDescPtr		xkb;
-    int			map_width;
-    KeySym *		core_syms;
-    unsigned int 	protected;
-    int *		types_inout;
-    KeySym * 		xkb_syms_rtrn;
-#endif
 {
 register int	i;
 unsigned int	empty;
@@ -340,18 +322,10 @@ int		nGroups,tmp,groupsWidth;
 }
 
 static XkbSymInterpretPtr
-#if NeedFunctionPrototypes
 _XkbFindMatchingInterp(	XkbDescPtr	xkb,
 			KeySym 		sym,
 			unsigned int	real_mods,
 			unsigned int	level)
-#else
-_XkbFindMatchingInterp(xkb,sym,real_mods,level)
-    XkbDescPtr		xkb;
-    KeySym		sym;
-    unsigned int	real_mods;
-    unsigned int	level;
-#endif
 {
 register unsigned	 i;
 XkbSymInterpretPtr	 interp,rtrn;
@@ -399,14 +373,7 @@ CARD8			 mods;
 }
 
 static void
-#if NeedFunctionPrototypes
 _XkbAddKeyChange(KeyCode *pFirst,unsigned char *pNum,KeyCode newKey)
-#else
-_XkbAddKeyChange(pFirst,pNum,newKey)
-    KeyCode *		pFirst;
-    unsigned char *	pNum;
-    KeyCode		newKey;
-#endif
 {
 KeyCode	last;
 
@@ -422,14 +389,7 @@ KeyCode	last;
 }
 
 static void
-#if NeedFunctionPrototypes
 _XkbSetActionKeyMods(XkbDescPtr xkb,XkbAction *act,unsigned mods)
-#else
-_XkbSetActionKeyMods(xkb,act,mods)
-    XkbDescPtr	xkb;
-    XkbAction *	act;
-    unsigned	mods;
-#endif
 {
 unsigned	tmp;
 
@@ -457,14 +417,7 @@ unsigned	tmp;
 #define	IBUF_SIZE	8
 
 Bool
-#if NeedFunctionPrototypes
 XkbApplyCompatMapToKey(XkbDescPtr xkb,KeyCode key,XkbChangesPtr changes)
-#else
-XkbApplyCompatMapToKey(xkb,key,changes)
-    XkbDescPtr		xkb;
-    KeyCode		key;
-    XkbChangesPtr	changes;
-#endif
 {
 KeySym *		syms;
 unsigned char 		explicit,mods;
@@ -613,22 +566,12 @@ unsigned		changed,tmp;
 }
 
 Bool
-#if NeedFunctionPrototypes
 XkbUpdateMapFromCore(	XkbDescPtr	xkb,
 			KeyCode		first_key,
 			int		num_keys,
 			int		map_width,
 			KeySym *	core_keysyms,
 			XkbChangesPtr	changes)
-#else
-XkbUpdateMapFromCore(xkb,first_key,num_keys,map_width,core_keysyms,changes)
-    XkbDescPtr		xkb;
-    KeyCode		first_key;
-    int			num_keys;
-    int			map_width;
-    KeySym *		core_keysyms;
-    XkbChangesPtr	changes;
-#endif
 {
 register int	key,last_key;
 KeySym *	syms;
@@ -705,22 +648,12 @@ KeySym *	syms;
 }
 
 Status
-#if NeedFunctionPrototypes
 XkbChangeTypesOfKey(	XkbDescPtr		 xkb,
 			int		 	 key,
 			int			 nGroups,
 			unsigned	 	 groups,
 			int	* 	 	 newTypesIn,
 			XkbMapChangesPtr	 changes)
-#else
-XkbChangeTypesOfKey(xkb,key,nGroups,groups,newTypesIn,changes)
-    XkbDescPtr		 xkb;
-    int		 	 key;
-    int			 nGroups;
-    unsigned	 	 groups;
-    int	* 	 	 newTypesIn;
-    XkbMapChangesPtr	 changes;
-#endif
 {
 XkbKeyTypePtr	pOldType,pNewType;
 register int	i;
@@ -839,14 +772,7 @@ int		width,nOldGroups,oldWidth,newTypes[XkbNumKbdGroups];
 /***====================================================================***/
 
 Bool
-#if NeedFunctionPrototypes
 XkbVirtualModsToReal(XkbDescPtr xkb,unsigned virtual_mask,unsigned *mask_rtrn)
-#else
-XkbVirtualModsToReal(xkb,virtual_mask,mask_rtrn)
-    XkbDescPtr	xkb;
-    unsigned	virtual_mask;
-    unsigned *	mask_rtrn;
-#endif
 {
 register int i,bit;
 register unsigned mask;
@@ -870,14 +796,7 @@ register unsigned mask;
 /***====================================================================***/
 
 Bool
-#if NeedFunctionPrototypes
 XkbUpdateActionVirtualMods(XkbDescPtr xkb,XkbAction *act,unsigned changed)
-#else
-XkbUpdateActionVirtualMods(xkb,act,changed)
-    XkbDescPtr	xkb;
-    XkbAction *	act;
-    unsigned	changed;
-#endif
 {
 unsigned int	tmp;
 
@@ -903,18 +822,10 @@ unsigned int	tmp;
 }
 
 void
-#if NeedFunctionPrototypes
 XkbUpdateKeyTypeVirtualMods(	XkbDescPtr	xkb,
 				XkbKeyTypePtr	type,
 				unsigned int	changed,
 				XkbChangesPtr 	changes)
-#else
-XkbUpdateKeyTypeVirtualMods(xkb,type,changed,changes)
-    XkbDescPtr		xkb;
-    XkbKeyTypePtr	type;
-    unsigned int	changed;
-    XkbChangesPtr	changes;
-#endif
 {
 register unsigned int	i;
 unsigned int		mask;
@@ -959,14 +870,7 @@ unsigned int		mask;
 }
 
 Bool
-#if NeedFunctionPrototypes
 XkbApplyVirtualModChanges(XkbDescPtr xkb,unsigned changed,XkbChangesPtr changes)
-#else
-XkbApplyVirtualModChanges(xkb,changed,changes)
-    XkbDescPtr		xkb;
-    unsigned		changed;
-    XkbChangesPtr	changes;
-#endif
 {
 register int	i;
 unsigned int	checkState = 0;