From: Bruce Momjian <bruce@momjian.us>
Date: Sat, 24 Sep 2011 13:24:14 +0000 (-0400)
Subject: Expand pgrminclude to exclude use of macros CppAsString and CppConcat.
X-Git-Tag: REL9_2_BETA1~1067
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=337c0b03614c45516f2c3ec956405713bb264d54;p=thirdparty%2Fpostgresql.git

Expand pgrminclude to exclude use of macros CppAsString and CppConcat.
---

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