* data/c.m4 (b4_token_defines): Protect against double-inclusion

[bison.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index e9253f1d1ee9488f9a964ea92c2a600e6067ff0b..c61beda2cac50bdd062171963f1b2be76fef31e4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2002-10-13  Paul Eggert  <eggert@twinsun.com>
+
+       * data/c.m4 (b4_token_defines): Protect against double-inclusion
+       by wrapping enum yytokentype's definition inside #ifndef
+       YYTOKENTYPE.  This undoes a bug I introduced on 2002-10-12.
+
+2002-10-13  Akim Demaille  <akim@epita.fr>
+
+       * data/glr.c (yyglrShiftDefer, yyaddDeferredAction, yydoAction):
+       Un yy- yyrhs to avoid the name clash with the global YYRHS.
+
+2002-10-13  Akim Demaille  <akim@epita.fr>
+
+       * Makefile.maint: Update from Autoconf 2.54.
+       * m4/strerror_r.m4 (AC_FUNC_STRERROR_R): Remove, shipped with 2.54.
+
+2002-10-13  Akim Demaille  <akim@epita.fr>
+
+       * src/print.c (print_state): Separate the list of solved conflicts
+       from the other items.
+       * tests/conflicts.at (Resolved SR Conflicts): Adjust.
+
 2002-10-13  Akim Demaille  <akim@epita.fr>
 
        Let nondeterministic skeletons be usable with deterministic