Rename YYLTYPE to struct YYLTYPE

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

diff --git a/src/xkbcomp/parseutils.c b/src/xkbcomp/parseutils.c
index 06183c5..df76a85 100644 (file)
--- a/src/xkbcomp/parseutils.c
+++ b/src/xkbcomp/parseutils.c
@@ -684,7 +684,7 @@ CreateXKBFile(int type, char *name, ParseCommon * defs, unsigned flags)
 }
 
 unsigned
-StmtSetMerge(ParseCommon * stmt, unsigned merge, YYLTYPE *loc, void *scanner)
+StmtSetMerge(ParseCommon * stmt, unsigned merge, struct YYLTYPE *loc, void *scanner)
 {
     if ((merge == MergeAltForm) && (stmt->stmtType != StmtKeycodeDef))
     {

diff --git a/src/xkbcomp/parseutils.h b/src/xkbcomp/parseutils.h
index 088af7c..c2880a5 100644 (file)
--- a/src/xkbcomp/parseutils.h
+++ b/src/xkbcomp/parseutils.h
@@ -111,7 +111,7 @@ extern IncludeStmt *
 IncludeCreate(char *str, unsigned merge);
 
 extern unsigned
-StmtSetMerge(ParseCommon *stmt, unsigned merge, YYLTYPE *loc, void *scanner);
+StmtSetMerge(ParseCommon *stmt, unsigned merge, struct YYLTYPE *loc, void *scanner);
 
 extern void
 CheckDefaultMap(XkbFile *maps, const char *fileName);

diff --git a/src/xkbcomp/xkbscan.l b/src/xkbcomp/xkbscan.l
index 276ee8f..99a1da5 100644 (file)
--- a/src/xkbcomp/xkbscan.l
+++ b/src/xkbcomp/xkbscan.l
@@ -196,7 +196,7 @@ alternate_group             return ALTERNATE_GROUP;
 %%
 
 void
-yyerror(YYLTYPE *loc, void *scanner, const char *msg)
+yyerror(struct YYLTYPE *loc, void *scanner, const char *msg)
 {
     struct scanner_extra *extra = yyget_extra(scanner);