maint: fix some syntax-check issues.

	* cfg.mk (local-checks-to-skip): Remove
	sc_prohibit_quotearg_without_use, sc_prohibit_strcmp,
	sc_unmarked_diagnostics, sc_useless_cpp_parens.
	(sc_unmarked_diagnostics): Skip DJGPP.
	* data/yacc.c, src/LR0.c, src/closure.c,
	* src/flex-scanner.h, src/gram.c, src/lalr.c,
	* src/print-xml.c, src/print.c, src/print_graph.c,
	* src/reader.c, src/reduce.c, src/tables.c:
	Don't use parens with cpp's defined.
	Remove useless includes.

diff --git a/cfg.mk b/cfg.mk
index 18aa4a2545eaa5f2f1d443edd574e02e7644935c..03cbe642907f2f070aa4c78ddb911b19dccc8b08 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -44,10 +44,7 @@ local-checks-to-skip =                       \
   sc_prohibit_doubled_word             \
   sc_prohibit_empty_lines_at_EOF       \
   sc_prohibit_magic_number_exit                \
-  sc_prohibit_quotearg_without_use     \
-  sc_prohibit_strcmp                   \
-  sc_unmarked_diagnostics              \
-  sc_useless_cpp_parens
+  sc_prohibit_strcmp
 
 # The local directory containing the checked-out copy of gnulib used in
 # this release.  Used solely to get a date for the "announcement" target.
@@ -66,3 +63,4 @@ update-copyright-env = \
 exclude_file_name_regexp--sc_space_tab = ^tests/(input|c\+\+)\.at$$
 exclude_file_name_regexp--sc_require_config_h_first = \
   ^(lib/yyerror|data/(glr|yacc))\.c$$
+exclude_file_name_regexp--sc_unmarked_diagnostics = ^djgpp/

diff --git a/data/yacc.c b/data/yacc.c
index b6137c2b91079db860af187bdb4d8d10712b6f22..5f4ddafbf727fa6664e5fa0f5405f367849b1588 100644 (file)
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -1952,7 +1952,7 @@ yyabortlab:
   yyresult = 1;
   goto yyreturn;
 
-#if ]b4_lac_if([[1]], [[!defined(yyoverflow) || YYERROR_VERBOSE]])[
+#if ]b4_lac_if([[1]], [[!defined yyoverflow || YYERROR_VERBOSE]])[
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/

diff --git a/src/LR0.c b/src/LR0.c
index 223edcc4258f7e9f0210a9eef11e3431ff73374c..a757f006faa1db66d63d76ad66d0cf507174253e 100644 (file)
--- a/src/LR0.c
+++ b/src/LR0.c
@@ -26,7 +26,6 @@
 #include "system.h"
 
 #include <bitset.h>
-#include <quotearg.h>
 
 #include "LR0.h"
 #include "closure.h"

diff --git a/src/closure.c b/src/closure.c
index 2bce28800a494db87c131347491783107dea0d9f..929aa777bb513241b5de256b05e21b82b744825a 100644 (file)
--- a/src/closure.c
+++ b/src/closure.c
@@ -24,7 +24,6 @@
 #include <bitset.h>
 #include <bitsetv-print.h>
 #include <bitsetv.h>
-#include <quotearg.h>
 
 #include "closure.h"
 #include "derives.h"

diff --git a/src/flex-scanner.h b/src/flex-scanner.h
index 8344cd10bcb6bb97310c2a3ece08f85709cbd942..572464afa469b29960e35ebf5136ffa6b597ecda 100644 (file)
--- a/src/flex-scanner.h
+++ b/src/flex-scanner.h
@@ -51,11 +51,11 @@ int   FLEX_PREFIX (lex_destroy) (void);
    versions according to the Flex manual) leak memory if yylex_destroy is not
    invoked.  However, yylex_destroy is not defined before Flex 2.5.9, so give
    an implementation here that at least appears to work with Flex 2.5.4.  */
-#if !defined(YY_FLEX_MAJOR_VERSION) || YY_FLEX_MAJOR_VERSION < 2 \
+#if !defined YY_FLEX_MAJOR_VERSION || YY_FLEX_MAJOR_VERSION < 2 \
     || (YY_FLEX_MAJOR_VERSION == 2 \
-        && (!defined(YY_FLEX_MINOR_VERSION) || YY_FLEX_MINOR_VERSION < 5 \
+        && (!defined YY_FLEX_MINOR_VERSION || YY_FLEX_MINOR_VERSION < 5 \
             || (YY_FLEX_MINOR_VERSION == 5 \
-                && (!defined(YY_FLEX_SUBMINOR_VERSION) \
+                && (!defined YY_FLEX_SUBMINOR_VERSION \
                     || YY_FLEX_SUBMINOR_VERSION < 9))))
 # define yylex_destroy() yy_delete_buffer (YY_CURRENT_BUFFER)
 #endif

diff --git a/src/gram.c b/src/gram.c
index 8b228705517e8a89d8088f28cbde9674184583fe..46c8cd197eb0a70e9e5bcaf3bab65f87086ce2ca 100644 (file)
--- a/src/gram.c
+++ b/src/gram.c
@@ -21,8 +21,6 @@
 #include <config.h>
 #include "system.h"
 
-#include <quotearg.h>
-
 #include "complain.h"
 #include "getargs.h"
 #include "gram.h"

diff --git a/src/lalr.c b/src/lalr.c
index 61fa42d0b5e19029d39ef46ffb7cf7bbd1a3de7a..f86bde1c02b5d893133839a486f6aa1a2a11f07b 100644 (file)
--- a/src/lalr.c
+++ b/src/lalr.c
@@ -27,7 +27,6 @@
 
 #include <bitset.h>
 #include <bitsetv.h>
-#include <quotearg.h>
 
 #include "LR0.h"
 #include "complain.h"

diff --git a/src/print-xml.c b/src/print-xml.c
index ab5ea00f22f7f1d5059978bc56c464153fc91d9c..ce71e1584c7db8bc213f575bdcadf98c26f58eff 100644 (file)
--- a/src/print-xml.c
+++ b/src/print-xml.c
@@ -23,7 +23,6 @@
 #include <stdarg.h>
 
 #include <bitset.h>
-#include <quotearg.h>
 
 #include "LR0.h"
 #include "closure.h"

diff --git a/src/print.c b/src/print.c
index 99dea233d9f4e23134295d94f3dc17a36a1bda41..58a9016addb090e30c622f21c4e2368a726d9b21 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -22,7 +22,6 @@
 #include "system.h"
 
 #include <bitset.h>
-#include <quotearg.h>
 
 #include "LR0.h"
 #include "closure.h"

diff --git a/src/print_graph.c b/src/print_graph.c
index 68d7eb015f9e504bfd92a813dbe9ede2c841baaf..8dd8db4342b6b6f95a76d2241ba2dd0d8b9167b5 100644 (file)
--- a/src/print_graph.c
+++ b/src/print_graph.c
@@ -20,8 +20,6 @@
 #include <config.h>
 #include "system.h"
 
-#include <quotearg.h>
-
 #include "LR0.h"
 #include "closure.h"
 #include "complain.h"

diff --git a/src/reader.c b/src/reader.c
index 107fe9010f008d33b191eee3e144cd8112c7f206..85f686ef7c71d4c2179683eea784351c0c2bfa1c 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -22,7 +22,6 @@
 #include "system.h"
 
 #include <quote.h>
-#include <quotearg.h>
 
 #include "complain.h"
 #include "conflicts.h"

diff --git a/src/reduce.c b/src/reduce.c
index e6af15e0a53e1d0820742ec0ecd5978d309aa86f..de046ddbf3c98b2e5b5c0930975dd1e724d16920 100644 (file)
--- a/src/reduce.c
+++ b/src/reduce.c
@@ -29,7 +29,6 @@
 #include "system.h"
 
 #include <bitset.h>
-#include <quotearg.h>
 
 #include "complain.h"
 #include "files.h"

diff --git a/src/tables.c b/src/tables.c
index 35d0c9e4376387a4e1d83397c28afe02283c17de..f22ec9aa603073dd58ce9dafa0b6e52c5d9e4114 100644 (file)
--- a/src/tables.c
+++ b/src/tables.c
@@ -22,7 +22,6 @@
 #include "system.h"
 
 #include <bitsetv.h>
-#include <quotearg.h>
 
 #include "complain.h"
 #include "conflicts.h"