From db3458d6eabc07f7d0c6ee1913dc4ac7c3c3d558 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Sun, 19 Feb 2012 11:40:36 +0100 Subject: [PATCH 1/1] maint: address sc_prohibit_always-defined_macros. * cfg.mk: No longer skip it, except where EXIT_SUCCESS is used as a witness for stdlib.h. Skip this test when appropriate. * data/yacc.c: Drop a note about why EXIT_SUCCESS is defined here. --- cfg.mk | 18 ++++++++++-------- data/yacc.c | 1 + 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/cfg.mk b/cfg.mk index 503dda6a..0c539cb6 100644 --- a/cfg.mk +++ b/cfg.mk @@ -35,7 +35,6 @@ url_dir_list = \ # Tests not to run as part of "make distcheck". local-checks-to-skip = \ sc_immutable_NEWS \ - sc_prohibit_always-defined_macros \ sc_prohibit_always_true_header_tests \ sc_prohibit_atoi_atof \ sc_prohibit_doubled_word \ @@ -56,11 +55,14 @@ update-copyright-env = \ UPDATE_COPYRIGHT_FORCE=1 UPDATE_COPYRIGHT_USE_INTERVALS=1 exclude = $(foreach a,$(1),$(eval exclude_file_name_regexp--sc_$(a))) -$(call exclude, \ - bindtextdomain=^lib/main.c$$ \ - program_name=^lib/main.c$$ \ - prohibit_empty_lines_at_EOF=^src/parse-gram.h$$ \ - require_config_h_first=^(lib/yyerror|data/(glr|yacc))\.c$$ \ - space_tab=^tests/(input|c\+\+)\.at$$ \ - unmarked_diagnostics=^djgpp/ \ +$(call exclude, \ + bindtextdomain=^lib/main.c$$ \ + program_name=^lib/main.c$$ \ + prohibit_always-defined_macros=^data/yacc.c|^djgpp/ \ + prohibit_always-defined_macros+=?|^src/(parse-gram.c|system.h)$$ \ + prohibit_always-defined_macros+=?|^tests/regression.at$$ \ + prohibit_empty_lines_at_EOF=^src/parse-gram.h$$ \ + require_config_h_first=^(lib/yyerror|data/(glr|yacc))\.c$$ \ + space_tab=^tests/(input|c\+\+)\.at$$ \ + unmarked_diagnostics=^djgpp/ \ ) diff --git a/data/yacc.c b/data/yacc.c index 5f4ddafb..d59caf34 100644 --- a/data/yacc.c +++ b/data/yacc.c @@ -438,6 +438,7 @@ b4_push_if([], [b4_lac_if([], [[ # define YYSTACK_ALLOC alloca # if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && ]b4_c_modern[ # include /* INFRINGES ON USER NAME SPACE */ + /* Use EXIT_SUCCESS as a witness for stdlib.h. */ # ifndef EXIT_SUCCESS # define EXIT_SUCCESS 0 # endif -- 2.45.2