Exclude utils/probes.h and pg_trace.h from cpluspluscheck
authorPeter Eisentraut <peter_e@gmx.net>
Sat, 2 Mar 2013 03:43:47 +0000 (22:43 -0500)
committerPeter Eisentraut <peter_e@gmx.net>
Sat, 2 Mar 2013 03:46:11 +0000 (22:46 -0500)
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

index 9004b141d17e856061f432d8e55c020edf1dfe0f..eedfc8520b030659fd91038d8345f20737eb8c8d 100755 (executable)
@@ -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" {'