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.

diff --git a/.x-sc_prohibit_strcmp b/.x-sc_prohibit_strcmp
index fdceaf00bd430a61e781a84b8cad1626a7f07523..56631abf1919d1804b8f9d3fe4471fc5c1854375 100644 (file)
--- 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 a7d0b860bd7fffea1d6efbaf06a56017ba11d978..cb3c6a56d6842c44c7c8c918e9ec8ffecd0d8166 100644 (file)
--- 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; } || :