From: Akim Demaille <demaille@gostai.com>
Date: Sun, 19 Feb 2012 10:40:36 +0000 (+0100)
Subject: maint: address sc_prohibit_always-defined_macros.
X-Git-Tag: v2.5.1_rc2~94
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/43e9e2a113dd4c30e304e5130cfca83ea704c14e?ds=inline

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.

Conflicts:

	cfg.mk
---

diff --git a/cfg.mk b/cfg.mk
index d9221ee5..358631d9 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -39,7 +39,6 @@ url_dir_list = \
 local-checks-to-skip = \
   changelog-check \
   sc_immutable_NEWS			\
-  sc_prohibit_always-defined_macros	\
   sc_prohibit_always_true_header_tests	\
   sc_prohibit_atoi_atof			\
   sc_prohibit_doubled_word		\
@@ -60,12 +59,15 @@ 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.[ch]$$		\
-  require_config_h_first=^(lib/yyerror|data/(glr|yacc))\.c$$	\
-  space_tab=^tests/(input|c\+\+)\.at$$				\
-  trailing_blank=^src/parse-gram.[ch]$$				\
-  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.[ch]$$			\
+  require_config_h_first=^(lib/yyerror|data/(glr|yacc))\.c$$		\
+  space_tab=^tests/(input|c\+\+)\.at$$					\
+  trailing_blank=^src/parse-gram.[ch]$$					\
+  unmarked_diagnostics=^djgpp/						\
 )
diff --git a/data/yacc.c b/data/yacc.c
index 3d535009..d18b2698 100644
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -437,6 +437,7 @@ b4_push_if([], [b4_lac_if([], [[
 #    define YYSTACK_ALLOC alloca
 #    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && ]b4_c_modern[
 #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
 #     ifndef EXIT_SUCCESS
 #      define EXIT_SUCCESS 0
 #     endif