summaryrefslogtreecommitdiff
path: root/src/scan.l
diff options
context:
space:
mode:
authorrlar <rlar>2016-02-28 14:17:36 +0100
committerWill Estes <westes575@gmail.com>2016-02-28 18:50:12 -0500
commit804efe8c42f692d0756b197e3cc013a09b329383 (patch)
treecdeab56ed2536529f65daf4d09015ec59b7d36af /src/scan.l
parent80484ea2673393bf725ade8e72cda98983fa85cb (diff)
fix name clash, OPT_OUTFILE from parse.y and from options.h
these collide: OPT_OUTFILE OPT_PREFIX OPT_YYCLASS rename them TOK_... in the parser
Diffstat (limited to 'src/scan.l')
-rw-r--r--src/scan.l6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/scan.l b/src/scan.l
index 148d7d9..73ed109 100644
--- a/src/scan.l
+++ b/src/scan.l
@@ -422,9 +422,9 @@ M4QEND "]]"
yyset_lloc ACTION_M4_IFDEF("M4""_YY_NO_SET_LLOC", ! option_sense);
extra-type return OPT_EXTRA_TYPE;
- outfile return OPT_OUTFILE;
- prefix return OPT_PREFIX;
- yyclass return OPT_YYCLASS;
+ outfile return TOK_OUTFILE;
+ prefix return TOK_PREFIX;
+ yyclass return TOK_YYCLASS;
header(-file)? return OPT_HEADER;
tables-file return OPT_TABLES;
tables-verify {