From 1275b88f711c663e3b7a77c7526a934752efe52d Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Fri, 1 Mar 2013 22:43:47 -0500 Subject: [PATCH] Exclude utils/probes.h and pg_trace.h from cpluspluscheck They can include sys/sdt.h from SystemTap, which itself contains C++ code and so won't compile with a C++ compiler under extern "C" linkage. --- src/tools/pginclude/cpluspluscheck | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/tools/pginclude/cpluspluscheck b/src/tools/pginclude/cpluspluscheck index 9004b141d1..eedfc8520b 100755 --- a/src/tools/pginclude/cpluspluscheck +++ b/src/tools/pginclude/cpluspluscheck @@ -18,12 +18,16 @@ trap 'rm -rf $tmp' 0 1 2 3 15 # regex/regerrs.h is not meant to be included standalone. # parser/gram.h will be included by parser/gramparse.h. # parser/kwlist.h is not meant to be included standalone. +# pg_trace.h and utils/probes.h can include sys/sdt.h from SystemTap, +# which itself contains C++ code and so won't compile with a C++ +# compiler under extern "C" linkage. for f in `find src/include src/interfaces/libpq/libpq-fe.h src/interfaces/libpq/libpq-events.h -name '*.h' -print | \ grep -v -e ^src/include/port/ \ -e ^src/include/rusagestub.h -e ^src/include/regex/regerrs.h \ -e ^src/include/access/rmgrlist.h \ - -e ^src/include/parser/gram.h -e ^src/include/parser/kwlist.h` + -e ^src/include/parser/gram.h -e ^src/include/parser/kwlist.h \ + -e ^src/include/pg_trace.h -e ^src/include/utils/probes.h` do { echo ' extern "C" {' -- 2.40.0