summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas E. Dickey <dickey@invisible-island.net>2024-03-05 04:10:29 -0500
committerThomas E. Dickey <dickey@invisible-island.net>2024-03-05 05:33:26 -0500
commitcebd6e2bab56c12d48ed3aa3c562bf9661595394 (patch)
tree9edc2c0e4c37476b9e59f7be5680f6f244857556
parent4b01408715cd10e3bf02eb1e87531917a09c2645 (diff)
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 <dickey@invisible-island.net>
-rw-r--r--src/gram.y1
-rw-r--r--src/lex.l3
2 files changed, 3 insertions, 1 deletions
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)))