From d6a62182f07766296244ccc4f8c2d1a800e987bd Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Fri, 28 Nov 2008 22:08:09 +0100
Subject: [PATCH] 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.
---
 .x-sc_prohibit_strcmp | 1 -
 maint.mk              | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.x-sc_prohibit_strcmp b/.x-sc_prohibit_strcmp
index fdceaf00bd..56631abf19 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 a7d0b860bd..cb3c6a56d6 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; } || :