From 9ac749ceb5ad040dc2aa834d9f698a3da2425a96 Mon Sep 17 00:00:00 2001
From: Andrew Dunstan <andrew@dunslane.net>
Date: Tue, 18 Dec 2012 16:30:14 -0500
Subject: [PATCH] Don't include postgres.h in postgres_fe.h for cpluspluscheck.

Error exposed by recent Assert changes.

Complaint from Peter Eisentraut.
---
 src/tools/pginclude/cpluspluscheck | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tools/pginclude/cpluspluscheck b/src/tools/pginclude/cpluspluscheck
index 1f0fa47ba81..b9ce51c2245 100755
--- a/src/tools/pginclude/cpluspluscheck
+++ b/src/tools/pginclude/cpluspluscheck
@@ -25,7 +25,7 @@ for f in `find src/include src/interfaces/libpq/libpq-fe.h src/interfaces/libpq/
 do
 	{
 	    echo ' extern "C" {'
-	    echo '#include "postgres.h"'
+	    test $f != "src/include/postgres_fe.h" && echo '#include "postgres.h"'
 	    echo "#include \"$f\""
 	    echo '};'
 	} >$tmp/test.cpp
-- 
GitLab