summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2008-11-28 22:08:09 +0100
committerJim Meyering <meyering@redhat.com>2008-11-30 19:15:51 +0100
commitd6a62182f07766296244ccc4f8c2d1a800e987bd (patch)
treea4cda5253ea82aea3e4e829f136ff061d6d3b4a3
parent847ab6a518b0e5d88f4e1aba29aa1caeef889fa2 (diff)
downloadcoreutils-d6a62182f07766296244ccc4f8c2d1a800e987bd.tar.xz
build: don't reject definition of STREQ
* maint.mk (sc_prohibit_strcmp): Tighten rule: exclude macro definitions like the one in system.h. * .x-sc_prohibit_strcmp: Don't exempt src/system.h.
-rw-r--r--.x-sc_prohibit_strcmp1
-rw-r--r--maint.mk3
2 files changed, 2 insertions, 2 deletions
diff --git a/.x-sc_prohibit_strcmp b/.x-sc_prohibit_strcmp
index fdceaf00b..56631abf1 100644
--- a/.x-sc_prohibit_strcmp
+++ b/.x-sc_prohibit_strcmp
@@ -1,2 +1 @@
-^src/system\.h
ChangeLog
diff --git a/maint.mk b/maint.mk
index a7d0b860b..cb3c6a56d 100644
--- a/maint.mk
+++ b/maint.mk
@@ -132,7 +132,8 @@ sc_prohibit_atoi_atof:
# Use STREQ rather than comparing strcmp == 0, or != 0.
sc_prohibit_strcmp:
@grep -nE '! *str''cmp *\(|\<str''cmp *\([^)]+\) *==' \
- $$($(VC_LIST_EXCEPT)) && \
+ $$($(VC_LIST_EXCEPT)) \
+ | grep -vE ':# *define STREQ\(' && \
{ echo '$(ME): use STREQ in place of the above uses of str''cmp' \
1>&2; exit 1; } || :