From d504183866dccdf8e7c09522b601236d91591141 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Sun, 1 Jan 2012 10:54:51 +0100
Subject: maint: enable the useless_cpp_parens syntax-check rule

* cfg.mk (local-checks-to-skip): Remove sc_useless_cpp_parens,
thus enabling this syntax-check rule.
* src/patch.c: Remove unneeded parentheses.
---
 cfg.mk      | 3 +--
 src/patch.c | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/cfg.mk b/cfg.mk
index 2730d3e..63dda64 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -31,8 +31,7 @@ local-checks-to-skip = \
   sc_prohibit_strcmp \
   sc_prohibit_test_minus_ao \
   sc_require_test_exit_idiom \
-  sc_space_tab \
-  sc_useless_cpp_parens
+  sc_space_tab
 
 exclude_file_name_regexp--sc_prohibit_doubled_word = ^src/util\.c$$
 exclude_file_name_regexp--sc_unmarked_diagnostics = ^src/util\.c$$
diff --git a/src/patch.c b/src/patch.c
index 652db31..9e94823 100644
--- a/src/patch.c
+++ b/src/patch.c
@@ -622,7 +622,7 @@ reinitialize_almost_everything (void)
 }
 
 static char const shortopts[] = "bB:cd:D:eEfF:g:i:l"
-#if 0 && defined(ENABLE_MERGE)
+#if 0 && defined ENABLE_MERGE
 				"m"
 #endif
 				"nNo:p:r:RstTuvV:x:Y:z:Z";
-- 
cgit v1.2.1