* parser.l (yylex_destroy): The FLEX_ version are prefixed with YY_

in old flexes too.

2 files changed, 8 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index c7542da3..1bfc552e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-10  Kaz Kylheku  <kaz@kylheku.com>
+
+	* parser.l (yylex_destroy): The FLEX_ version are prefixed with YY_
+	in old flexes too.
+
 2014-06-09  Kaz Kylheku  <kaz@kylheku.com>
 
 	New variable stdlib, with a sysroot mechanism to compute
diff --git a/parser.l b/parser.l
index fa3c88cb..0613e643 100644
--- a/parser.l
+++ b/parser.l
@@ -71,10 +71,9 @@ val form_to_ln_hash;
 
 static val prepared_error_message;
 
-#ifdef FLEX_MAJOR_VERSION
-#define FLEX_NUM_VERSION 1000*FLEX_MAJOR_VERSION + \
-                         100*FLEX_MINOR_VERSION + \
-                         FLEX_SUBMINOR_VERSION
+#define FLEX_NUM_VERSION 10000*YY_FLEX_MAJOR_VERSION + \
+                         100*YY_FLEX_MINOR_VERSION + \
+                         YY_FLEX_SUBMINOR_VERSION
 
 #if FLEX_NUM_VERSION < 20509
 int yylex_destroy(void)
@@ -82,7 +81,6 @@ int yylex_destroy(void)
   return 0;
 }
 #endif
-#endif
 
 void yyerror(const char *s)
 {