From 337c0b03614c45516f2c3ec956405713bb264d54 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Sat, 24 Sep 2011 09:24:14 -0400
Subject: [PATCH] Expand pgrminclude to exclude use of macros CppAsString and
 CppConcat.

---
 src/tools/pginclude/pgrminclude | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tools/pginclude/pgrminclude b/src/tools/pginclude/pgrminclude
index d60519a0371..7dc5f58d8b9 100755
--- 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
-- 
GitLab