Merge.

2 files changed, 8 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index c9341a06..2bde99d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,14 @@
 
 2009-12-03  Kaz Kylheku  <kkylheku@gmail.com>
 
+	* parser.l (YY_NO_UNPUT): Removed superfluous #define. This is not
+	needed because suppressing generation of unput is requested via
+	the %option. In scanners generated by the legacy version of
+	flex, 2.5.4, still widely in use. this redundancy leads to
+	a multiple #define YY_NO_UNPUT and a compiler warning.
+
+2009-12-03  Kaz Kylheku  <kkylheku@gmail.com>
+
 	Fix for failing test suite on MIPS machine, due to
 	gc failing to mark a local variable in txr_main.
 
diff --git a/parser.l b/parser.l
index 586c21d1..8ed85887 100644
--- a/parser.l
+++ b/parser.l
@@ -42,8 +42,6 @@
 #include "utf8.h"
 #include "parser.h"
 
-#define YY_NO_UNPUT
-
 #define YY_INPUT(buf, result, max_size)           \
   do {                                            \
     val c = nil;                                  \