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 80bd73b04b8bfd727ab78977a61c3e41601fe7ba..a7b16c570767abfb2c44b3cf40f6488956579cae 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -48,10 +48,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.
@@ -70,3 +67,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 2beef804a32c2793be152b79c94f18a1a08a23aa..3d5350092e7d98ebc56660b256ab14be00118128 100644 (file)
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -2018,7 +2018,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 6b4f145e570ad0725f8d69fda0183573ae0cb1da..37bfe8137acc0623992628ee05078d065fb7322b 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 9e5531b318068f595e7f97f294fc38e33058a66e..d9bc5ffa56c32c7c5e547ae5851657b47ada659f 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 7c055b97ccc9b6bdeb5479eaf8a37e79fcce47f4..23a266ac54e2683396f2bd3324551548a0cacc56 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 cd9e67cb9da1f443ac981fe337a444e8b4b75cb9..d1b3804337bd55a622896ae571453fa696c77c62 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 860c66a071f28c8ade39cbee214debf4488d66d9..98661544ff40d57d7f8ef17664f3c1d74b707e7c 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 400ce69f78fc6086b14d3def7e6a394b2ae9057e..e37a74147a651050140b148a37bdb2a462979977 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 9b855113051e956f1a0c2f760daa1c71642e8828..cb227aa513081fec25d1665b423dd02f1bc63bc6 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 179b5b10096be58b54e0e4a1ee295bde8202c2e4..8571e147b5cef0b2a049d9caf226ec32c0faddfa 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 5b909ff349dea6e6fbcbccdbf52affd18f0b9639..7dd0aaa46c7b13d528e31a18746a4501175bd945 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 f7bc380ad9a3d18da683e4d6e6570995ea625edc..5338393c312be029a027ec3dc1cef1d04a97a77d 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 2a243cfbaa68b071707a519f5bd50427e4207de2..eb827b769ca825458d73de7468b3d78c7fb30286 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"