Merge branch 'branch-2.6' into maint

[bison.git] / src / output.c

diff --git a/src/output.c b/src/output.c
index e77a2d1a0fc85a75d6f6bec202d96351778dfef2..3852729bb7694436a238e282c1c33fa6c83cd4f9 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -41,8 +41,6 @@
 #include "symtab.h"
 #include "tables.h"
 
-# define ARRAY_CARDINALITY(Array) (sizeof (Array) / sizeof *(Array))
-
 static struct obstack format_obstack;
 
 
@@ -628,7 +626,7 @@ prepare (void)
     use_push_for_pull_flag = true;
 
   /* Flags. */
-  MUSCLE_INSERT_BOOL ("debug_flag", debug_flag);
+  MUSCLE_INSERT_BOOL ("debug_flag", debug);
   MUSCLE_INSERT_BOOL ("defines_flag", defines_flag);
   MUSCLE_INSERT_BOOL ("error_verbose_flag", error_verbose);
   MUSCLE_INSERT_BOOL ("glr_flag", glr_parser);