diff options
| -rw-r--r-- | cfg.mk | 3 | ||||
| -rw-r--r-- | src/patch.c | 2 |
2 files changed, 2 insertions, 3 deletions
@@ -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"; |