From 1abbab65680b20cd6bee6f329588089317864b45 Mon Sep 17 00:00:00 2001
From: Kaleb Keithley <kaleb@freedesktop.org>
Date: Wed, 26 Nov 2003 22:49:12 +0000
Subject: merge latest (4.3.99.16) from XFree86 (vendor) branch

---
 utils.h    | 24 +-----------------------
 xkbevd.h   |  8 +-------
 xkbevd.man |  4 ++--
 3 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/utils.h b/utils.h
index 7aaf3fe..83e690c 100644
--- a/utils.h
+++ b/utils.h
@@ -27,7 +27,7 @@
    * used in advertising or publicity pertaining to distribution of the 
    * software without specific, written prior permission.
   \*/
-/* $XFree86: xc/programs/xkbevd/utils.h,v 1.6 2002/01/14 18:30:11 dawes Exp $ */
+/* $XFree86: xc/programs/xkbevd/utils.h,v 1.7 2003/11/17 22:20:53 dawes Exp $ */
 
 /***====================================================================***/
 
@@ -86,34 +86,24 @@ typedef union {
 /***====================================================================***/
 
 extern	Opaque	uAlloc(
-#if NeedFunctionPrototypes
     unsigned	/* size */
-#endif
 );
 extern	Opaque	uCalloc(
-#if NeedFunctionPrototypes
     unsigned	/* n */,
     unsigned	/* size */
-#endif
 );
 extern	Opaque	uRealloc(
-#if NeedFunctionPrototypes
     Opaque	/* old */,
     unsigned	/* newSize */
-#endif
 );
 extern	Opaque	uRecalloc(
-#if NeedFunctionPrototypes
     Opaque 	/* old */,
     unsigned	/* nOld */,
     unsigned	/* nNew */,
     unsigned 	/* newSize */
-#endif
 );
 extern	void	uFree(
-#if NeedFunctionPrototypes
     Opaque	/* ptr */
-#endif
 );
 
 #define	uTypedAlloc(t)		((t *)uAlloc((unsigned)sizeof(t)))
@@ -152,25 +142,19 @@ extern void uInternalError ( char *s, ... );
 #define	uStrCasePrefix(p,s)	(strncasecmp(p,s,strlen(p))==0)
 #else
 extern	int uStrCaseCmp(
-#if NeedFunctionPrototypes
 	char *	/* s1 */,
 	char *	/* s2 */
-#endif
 );
 extern	int uStrCasePrefix(
-#if NeedFunctionPrototypes
 	char *	/* p */,
 	char *	/* str */
-#endif
 );
 #endif
 #ifdef HAVE_STRDUP
 #define	uStringDup(s1)		(strdup(s1))
 #else
 extern	char *uStringDup(
-#if NeedFunctionPrototypes
 	char *	/* s1 */
-#endif
 );
 #endif
 
@@ -197,9 +181,7 @@ unsigned	int	DEBUG_VAR;
 extern	void	uDebug( char *s, ... );
 extern	void	uDebugNOI( char *s, ... );	/* no indent */
 extern	Boolean	uSetDebugFile(
-#if NeedFunctionPrototypes
     char *name
-#endif
 );
 extern	FILE	*uDebugFile;
 extern	int	uDebugIndentLevel;
@@ -235,15 +217,11 @@ extern	int	uDebugIndentSize;
 #endif
 
 extern	Boolean	uSetEntryFile(
-#if NeedFunctionPrototypes
     char *name
-#endif
 );
 extern	void	uEntry(int l, char *s, ... );
 extern	void	uExit(
-#if NeedFunctionPrototypes
     int l,char *rtVal
-#endif
 );
 #ifdef ENTRY_TRACKING_ON
 #define	ENTRY_BIT	0x10
diff --git a/xkbevd.h b/xkbevd.h
index 01d8c47..1ef705f 100644
--- a/xkbevd.h
+++ b/xkbevd.h
@@ -24,7 +24,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
-/* $XFree86: xc/programs/xkbevd/xkbevd.h,v 3.4 2001/01/17 23:46:09 dawes Exp $ */
+/* $XFree86: xc/programs/xkbevd/xkbevd.h,v 3.5 2003/11/17 22:20:53 dawes Exp $ */
 
 #ifndef XKBEVD_H
 #define	XKBEVD_H 1
@@ -82,23 +82,17 @@ typedef struct _CfgEntry {
 } CfgEntryRec,*CfgEntryPtr;
 
 extern void InterpretConfigs(
-#if NeedFunctionPrototypes
 	CfgEntryPtr	/* cfgs */
-#endif
 );
 
 extern char *SubstituteEventArgs(
-#if NeedFunctionPrototypes
     char *		/* cmd */,
     XkbEvent *		/* ev */
-#endif
 );
 
 extern void PrintXkbEvent(
-#if NeedFunctionPrototypes
 	FILE *		/* file */,
 	XkbEvent *	/* ev */
-#endif
 );
 
 extern int setScanState ( char * file, int line );
diff --git a/xkbevd.man b/xkbevd.man
index d00d2ef..d5d6562 100644
--- a/xkbevd.man
+++ b/xkbevd.man
@@ -1,6 +1,6 @@
 .\" $Xorg: xkbevd.man,v 1.3 2000/08/17 19:54:49 cpqbld Exp $
 .\"
-.\" $XFree86: xc/programs/xkbevd/xkbevd.man,v 1.7 2001/01/27 18:21:16 dawes Exp $
+.\" $XFree86: xc/programs/xkbevd/xkbevd.man,v 1.8 2003/05/29 21:48:12 herrb Exp $
 .\"
 .TH XKBCOMP 1 __xorgversion__
 .SH NAME
@@ -23,7 +23,7 @@ specification/action pairs and/or variable definitions.
 .PP
 An event specification consists of a short XKB event name followed by a 
 string or identifier which serves as a qualifier in parentheses;  empty 
-parentesis indicate no qualification and serve to specify the default 
+parenthesis indicate no qualification and serve to specify the default 
 command which is applied to events which do not match any of the other 
 specifications.  The interpretation of the qualifier depends on the type 
 of the event:  Bell events match using the name of the bell, message events 
-- 
cgit v1.2.3