# DP: #957539 avoid by renaming; still unsure whether this is correct # DP: but rename yyfilename as well since yy prefix is reserved-ish --- a/grammar.y +++ b/grammar.y @@ -74,8 +74,8 @@ int yylex(void); int n_errors = 0; struct ctrl *root; -char *yyfilename; -int yylineno; +char *mgpyyfilename; +int mgpyylineno; #ifdef HAVE_STDARG_H /* GCC complains if we declare this function in traditional style */ @@ -94,7 +94,7 @@ yyerror(msg) va_start(ap); #endif ++n_errors; - fprintf(stderr, "%s:%d: error: ", yyfilename, yylineno); + fprintf(stderr, "%s:%d: error: ", mgpyyfilename, mgpyylineno); vfprintf(stderr, msg, ap); fprintf(stderr, "\n"); va_end(ap); @@ -116,7 +116,7 @@ yywarn(msg) #else va_start(ap); #endif - fprintf(stderr, "%s:%d: warning: ", yyfilename, yylineno); + fprintf(stderr, "%s:%d: warning: ", mgpyyfilename, mgpyylineno); vfprintf(stderr, msg, ap); fprintf(stderr, "\n"); va_end(ap); --- a/parse.c +++ b/parse.c @@ -50,8 +50,8 @@ extern int findImage __P((char *, char * /* lex/yacc variables */ extern int n_errors; extern struct ctrl *root; -extern char *yyfilename; -extern int yylineno; +extern char *mgpyyfilename; +extern int mgpyylineno; /* Prevent warning if -Wall. */ #ifdef __GNUC__ extern void lex_init(u_char *); @@ -296,8 +296,8 @@ read_rc(fp, filename) if (buf[0] == '#' || !buf[0]) continue; - yyfilename = filename; - yylineno = lineno; + mgpyyfilename = filename; + mgpyylineno = lineno; lex_init(buf); if (yyparse() || n_errors) { @@ -421,8 +421,8 @@ read_file(fp, filename, page, line, prea if (buf[1] == '%') continue; - yyfilename = filename; - yylineno = lineno; + mgpyyfilename = filename; + mgpyylineno = lineno; lex_init(buf + 1); if (yyparse() || n_errors) { fprintf(stderr, "%s:%d: fatal syntax error detected\n", @@ -606,8 +606,8 @@ command: prevfiltermode = filtermode ? 1 : 0; - yyfilename = filename; - yylineno = lineno; + mgpyyfilename = filename; + mgpyylineno = lineno; lex_init(buf + 1); if (yyparse() || n_errors) { fprintf(stderr,