diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2013-03-01 22:43:47 -0500 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2013-03-01 22:43:47 -0500 |
| commit | 224f6e501220627d2d72833bd4876d42aefbcb6e (patch) | |
| tree | 0a34c9effc3edc4554ba7a10894005b93729b71a | |
| parent | 0fe397fa49559f78d2cbffa6f2422d65d9e0e143 (diff) | |
| download | postgresql-224f6e501220627d2d72833bd4876d42aefbcb6e.tar.gz postgresql-224f6e501220627d2d72833bd4876d42aefbcb6e.zip | |
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.
| -rwxr-xr-x | src/tools/pginclude/cpluspluscheck | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/tools/pginclude/cpluspluscheck b/src/tools/pginclude/cpluspluscheck index 1f0fa47ba81..e1d80f915e4 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" {' |