From: Peter Eisentraut Date: Sat, 2 Mar 2013 03:43:47 +0000 (-0500) Subject: Exclude utils/probes.h and pg_trace.h from cpluspluscheck X-Git-Tag: REL9_2_4~31 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=224f6e501220627d2d72833bd4876d42aefbcb6e;p=postgresql 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. --- diff --git a/src/tools/pginclude/cpluspluscheck b/src/tools/pginclude/cpluspluscheck index 1f0fa47ba8..e1d80f915e 100755 --- a/src/tools/pginclude/cpluspluscheck +++ b/src/tools/pginclude/cpluspluscheck @@ -17,11 +17,15 @@ 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/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" {'