XFree86 4.3.0.1xf86-4_3_0_1PRE_xf86-4_3_0_1

1 files changed, 6 insertions, 77 deletions

diff --git a/parseutils.h b/parseutils.h
index 6393747..7be50d1 100644
--- a/parseutils.h
+++ b/parseutils.h
@@ -24,6 +24,7 @@
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
  ********************************************************/
+/* $XFree86: xc/programs/xkbcomp/parseutils.h,v 1.5 2002/07/01 02:26:01 tsi Exp $ */
 
 #ifndef XKBPARSE_H
 #define	XKBPARSE_H 1
@@ -50,270 +51,198 @@ extern	XkbFile	*rtrnValue;
 #define d2(str,a,b)
 #endif
 
-_XFUNCPROTOBEGIN
 
 extern ParseCommon *AppendStmt(
-#if NeedFunctionPrototypes
     ParseCommon *	/* to */,
     ParseCommon *	/* append */
-#endif
 );
 
 extern ExprDef *ExprCreate(
-#if NeedFunctionPrototypes
     unsigned		/* op */,
     unsigned		/* type */
-#endif
 );
 
 extern ExprDef *ExprCreateUnary(
-#if NeedFunctionPrototypes
     unsigned	 	/* op */,
     unsigned	 	/* type */,
     ExprDef	*	/* child */
-#endif
 );
 
 extern ExprDef *ExprCreateBinary(
-#if NeedFunctionPrototypes
     unsigned	 	/* op */,
     ExprDef	*	/* left */,
     ExprDef	*	/* right */
-#endif
 );
 
 extern KeycodeDef *KeycodeCreate(
-#if NeedFunctionPrototypes
     char *		/* name */,
     ExprDef *		/* value */
-#endif
 );
 
 extern KeyAliasDef *KeyAliasCreate(
-#if NeedFunctionPrototypes
     char *		/* alias */,
     char *		/* real */
-#endif
 );
 
 extern VModDef *VModCreate(
-#if NeedFunctionPrototypes
     Atom		/* name */,
     ExprDef *		/* value */
-#endif
 );
 
 extern VarDef *VarCreate(
-#if NeedFunctionPrototypes
     ExprDef *		/* name */,
     ExprDef *		/* value */
-#endif
 );
 
 extern VarDef *BoolVarCreate(
-#if NeedFunctionPrototypes
     Atom		/* nameToken */,
     unsigned		/* set */
-#endif
 );
 
 extern InterpDef *InterpCreate(
-#if NeedFunctionPrototypes
     KeySym		/* sym */,
     ExprDef *		/* match */
-#endif
 );
 
 extern KeyTypeDef *KeyTypeCreate(
-#if NeedFunctionPrototypes
     Atom		/* name */,
     VarDef *		/* body */
-#endif
 );
 
 extern SymbolsDef *SymbolsCreate(
-#if NeedFunctionPrototypes
     char *		/* keyName */,
     ExprDef *		/* symbols */
-#endif
 );
 
 extern GroupCompatDef *GroupCompatCreate(
-#if NeedFunctionPrototypes
     int			/* group */,
     ExprDef *		/* def */
-#endif
 );
 
 extern ModMapDef *ModMapCreate(
-#if NeedFunctionPrototypes
     Atom		/* modifier */,
     ExprDef *		/* keys */
-#endif
 );
 
 extern IndicatorMapDef *IndicatorMapCreate(
-#if NeedFunctionPrototypes
     Atom		/* name */,
     VarDef *		/* body */
-#endif
 );
 
 extern IndicatorNameDef *IndicatorNameCreate(
-#if NeedFunctionPrototypes
     int			/* ndx */,
     ExprDef *		/* name */,
     Bool		/* virtual */
-#endif
 );
 
 extern ExprDef *ActionCreate(
-#if NeedFunctionPrototypes
     Atom	 	/* name */,
     ExprDef	*	/* args */
-#endif
 );
 
 extern ExprDef *CreateKeysymList(
-#if NeedFunctionPrototypes
     KeySym		/* sym */
-#endif
 );
 
 extern ShapeDef *ShapeDeclCreate(
-#if NeedFunctionPrototypes
     Atom		/* name */,
     OutlineDef *	/* outlines */
-#endif
 );
 
 extern OutlineDef *OutlineCreate(
-#if NeedFunctionPrototypes
     Atom		/* field */,
     ExprDef *		/* points */
-#endif
 );
 
 extern KeyDef *KeyDeclCreate(
-#if NeedFunctionPrototypes
     char *	/* name */,
     ExprDef *	/* expr */
-#endif
 );
 
 extern KeyDef *KeyDeclMerge(
-#if NeedFunctionPrototypes
     KeyDef *	/* into */,
     KeyDef *	/* from */
-#endif
 );
 
 extern RowDef *RowDeclCreate(
-#if NeedFunctionPrototypes
     KeyDef *	/* keys */
-#endif
 );
 
 extern SectionDef *SectionDeclCreate(
-#if NeedFunctionPrototypes
     Atom	/* name */,
     RowDef *	/* rows */
-#endif
 );
 
 extern OverlayKeyDef *OverlayKeyCreate(
-#if NeedFunctionPrototypes
     char *		/* under */,
     char *		/* over  */
-#endif
 );
 
 extern OverlayDef *OverlayDeclCreate(
-#if NeedFunctionPrototypes
     Atom		/* name */,
     OverlayKeyDef *	/* rows */
-#endif
 );
 
 extern DoodadDef *DoodadCreate(
-#if NeedFunctionPrototypes
     unsigned	/* type */,
     Atom	/* name */,
     VarDef *	/* body */
-#endif
 );
 
 extern ExprDef *AppendKeysymList(
-#if NeedFunctionPrototypes
     ExprDef *	/* list */,
     KeySym	/* sym */
-#endif
 );
 
 extern int LookupKeysym(
-#if NeedFunctionPrototypes
     char *	/* str */,
     KeySym *	/* sym_rtrn */
-#endif
 );
 
 extern	IncludeStmt *IncludeCreate(
-#if NeedFunctionPrototypes
     char *	/* str */,
     unsigned	/* merge */
-#endif
 );
 
 extern unsigned StmtSetMerge(
-#if NeedFunctionPrototypes
     ParseCommon *	/* stmt */,
     unsigned		/* merge */
-#endif
 );
 
 #ifdef DEBUG
 extern void PrintStmtAddrs(
-#if NeedFunctionPrototypes
     ParseCommon *	/* stmt */
-#endif
 );
 #endif
 
 extern int XKBParseFile(
-#if NeedFunctionPrototypes
-FILE  *			/* file */,
+    FILE  *		/* file */,
     XkbFile **		/* pRtrn */
-#endif
 );
 
 extern XkbFile *CreateXKBFile(
-#if NeedFunctionPrototypes
     int			/* type */,
     char *		/* name */,
     ParseCommon *	/* defs */,
     unsigned		/* flags */
-#endif
 );
 
 extern void yyerror(
-#if NeedFunctionPrototypes
     char *		/* s */
-#endif
 );
 
 extern int yywrap(
-#if NeedFunctionPrototypes
     void
-#endif
 );
 
+extern int yylex(void);
+extern int yyparse(void);
+
 extern int setScanState(
-#if NeedFunctionPrototypes
     char *	/* file */,
     int 	/* line */
-#endif
 );
 
-_XFUNCPROTOEND
+extern FILE *yyin;
 
 #endif /* XKBPARSE_H */