Expand pgrminclude to exclude use of macros CppAsString and CppConcat.

diff --git a/src/tools/pginclude/pgrminclude b/src/tools/pginclude/pgrminclude
index d60519a03714ce84eacd726d78263c01f31e4e1a..7dc5f58d8b94891294cbbe4b14d1558d76126ed7 100755 (executable)
--- a/src/tools/pginclude/pgrminclude
+++ b/src/tools/pginclude/pgrminclude
@@ -43,8 +43,8 @@ compile_file() {
    [ "$INCLUDE" = "postgres_fe.h" ] && continue
    [ "$INCLUDE" = "pg_config.h" ] && continue
    [ "$INCLUDE" = "c.h" ] && continue
-   # CppAsString2 will expand undefined identifiers, so skip files that use it
-   grep -q '\<CppAsString2\>' "$FILE" && continue
+   # Stringify macros will expand undefined identifiers, so skip files that use it
+   egrep -q '\<(CppAsString2?|CppConcat)\>' "$FILE" && continue
 
    # preserve configure-specific includes
    # these includes are surrounded by #ifdef's