Merge branch 'maint'

[bison.git] / src / complain.h

diff --git a/src/complain.h b/src/complain.h
index bdf6bfcd0c9fd13918f2e24d89e7625ddf272078..452508efb62061f34cd58abd29963c315a888750 100644 (file)
--- a/src/complain.h
+++ b/src/complain.h
@@ -35,32 +35,28 @@ typedef enum
     Wdeprecated       = 1 << 4,  /**< Obsolete constructs.  */
     Wother            = 1 << 5,  /**< All other warnings.  */
 
-    /* Deprecated, this option now uses a second instance of this enum */
     Werror            = 1 << 10, /**< Warnings are treated as errors.  */
-
     complaint         = 1 << 11, /**< All complaints.  */
     fatal             = 1 << 12, /**< All fatal errors.  */
     silent            = 1 << 13, /**< Do not display the warning type.  */
-
-    /**< All above warnings.  */
-    Wall              = ~complaint & ~fatal & ~silent 
+    Wall              = ~Werror  /**< All above warnings.  */
   } warnings;
 
 /** What warnings are issued.  */
 extern warnings warnings_flag;
 
-/** What warnings are made errors.  */
-extern warnings errors_flag;
-
 /** Display a "[-Wyacc]" like message on stderr.  */
 void warnings_print_categories (warnings warn_flags);
 
+/* Sub-messages indent. */
+#define SUB_INDENT (4)
+
 /** Record that a warning is about to be issued, and treat it as an
     error if <tt>warnings_flag & Werror</tt>.  This is exported
     only for the sake of Yacc-compatible conflict reports in conflicts.c.
     All other warnings should be implemented in complain.c and should use
     the normal warning format.  */
-void set_warning_issued (warnings warning);
+void set_warning_issued (void);
 
 /** Make a complaint, but don't specify any location.  */
 void complain (warnings flags, char const *message, ...)