summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--parser.l2
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 8714e7bc..b3ecc3a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2014-06-05 Kaz Kylheku <kaz@kylheku.com>
+ * parser.l (yylex_destroy): Only rely on the FLEX_ version
+ numbers if they are defined. In a newer flex, they are prefixed
+ by YY_.
+
+2014-06-05 Kaz Kylheku <kaz@kylheku.com>
+
* configure (lang_flags): Removing -D_BSD_SOURCE
from lang_flags. Adding a test for determining
which flag reveals BSD functions. This is due to the
diff --git a/parser.l b/parser.l
index 1fa7ac38..a49e43d5 100644
--- a/parser.l
+++ b/parser.l
@@ -71,6 +71,7 @@ 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
@@ -81,6 +82,7 @@ int yylex_destroy(void)
return 0;
}
#endif
+#endif
void yyerror(const char *s)
{