From cebd6e2bab56c12d48ed3aa3c562bf9661595394 Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Tue, 5 Mar 2024 04:10:29 -0500 Subject: amend yylineno change A recent change removed the declaration of yylineno from lex.l, making the program depend on the version of flex. Restore the declaration with an ifdef. Also, remove unused declaration in parse.c Signed-off-by: Thomas E. Dickey --- src/gram.y | 1 - src/lex.l | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gram.y b/src/gram.y index 9de5935..cf46d35 100644 --- a/src/gram.y +++ b/src/gram.y @@ -100,7 +100,6 @@ static int color; int mods = 0; unsigned int mods_used = (ShiftMask | ControlMask | Mod1Mask); -extern int yylineno; extern int yylex(void); static void yyerror(const char *s); diff --git a/src/lex.l b/src/lex.l index 8bb5d19..2d6ef0c 100644 --- a/src/lex.l +++ b/src/lex.l @@ -70,6 +70,9 @@ in this Software without prior written authorization from The Open Group. #include "parse.h" #ifdef FLEX_SCANNER +#if (YY_FLEX_MINOR_VERSION == 5) && (YY_FLEX_SUBMINOR_VERSION < 20) +int yylineno; +#endif #undef YY_INPUT #define YY_INPUT(buf,result,size) ((result) = doinput((buf),(size))) -- cgit v1.2.3