Merge branch 'maint'

[bison.git] / src / complain.h

diff --git a/src/complain.h b/src/complain.h
index e8c26d16ae1440a087f32f8afdca6e59bee698d5..452508efb62061f34cd58abd29963c315a888750 100644 (file)
--- a/src/complain.h
+++ b/src/complain.h
@@ -21,10 +21,6 @@
 
 # include "location.h"
 
-# ifdef __cplusplus
-extern "C" {
-# endif
-
 /*-------------.
 | --warnings.  |
 `-------------*/
@@ -36,7 +32,8 @@ typedef enum
     Wyacc             = 1 << 1,  /**< POSIXME.  */
     Wconflicts_sr     = 1 << 2,  /**< S/R conflicts.  */
     Wconflicts_rr     = 1 << 3,  /**< R/R conflicts.  */
-    Wother            = 1 << 4,  /**< All other warnings.  */
+    Wdeprecated       = 1 << 4,  /**< Obsolete constructs.  */
+    Wother            = 1 << 5,  /**< All other warnings.  */
 
     Werror            = 1 << 10, /**< Warnings are treated as errors.  */
     complaint         = 1 << 11, /**< All complaints.  */
@@ -51,6 +48,9 @@ extern warnings warnings_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.
@@ -74,8 +74,4 @@ void complain_at_indent (location loc, warnings flags, unsigned *indent,
 /** Whether an error was reported.  */
 extern bool complaint_issued;
 
-# ifdef __cplusplus
-}
-# endif
-
 #endif /* !COMPLAIN_H_ */