Don't include postgres.h in postgres_fe.h for cpluspluscheck.

adunstan · adunstan · commit 9ac749ceb5ad · 2012-12-18T16:30:14.000-05:00
Error exposed by recent Assert changes.

Complaint from Peter Eisentraut.
diff --git 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

Original file line number	Diff line number	Diff line change
@@ -25,7 +25,7 @@ for f in `find src/include src/interfaces/libpq/libpq-fe.h src/interfaces/libpq/
`25`	`25`	`do`
`26`	`26`	`{`
`27`	`27`	`echo ' extern "C" {'`
`28`		`- echo '#include "postgres.h"'`
	`28`	`+ test $f != "src/include/postgres_fe.h" && echo '#include "postgres.h"'`
`29`	`29`	`echo "#include \"$f\""`
`30`	`30`	`echo '};'`
`31`	`31`	`} >$tmp/test.cpp`