summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2020-03-21 22:28:44 +0000
committerTom Lane2020-03-21 22:28:44 +0000
commitd0587f52b3bb898db3c0011954de6ae9adc076c8 (patch)
treee29a9d2d7cbded6e42033f56bb2996a5de822b19
parentcb2fd7eac285b1b0a24eeb2b8ed4456b66c5a09f (diff)
Fix up recent breakage of headerscheck and cpluspluscheck.
headerscheck and cpluspluscheck should skip the recently-added cmdtaglist.h header, since (like kwlist.h and some other similarly- designed headers) it's not meant to be included standalone. evtcache.h was missing an #include to support its usage of Bitmapset. typecmds.h was missing an #include to support its usage of ParseState. The first two of these were evidently oversights in commit 2f9661311. I didn't track down exactly which change broke typecmds.h, but it must have been some rearrangement in one of its existing inclusions, because it's referenced ParseState for quite a long time and there were not complaints from these checking programs before.
-rw-r--r--src/include/commands/typecmds.h2
-rw-r--r--src/include/tcop/cmdtaglist.h2
-rw-r--r--src/include/utils/evtcache.h1
-rwxr-xr-xsrc/tools/pginclude/cpluspluscheck1
-rwxr-xr-xsrc/tools/pginclude/headerscheck1
5 files changed, 5 insertions, 2 deletions
diff --git a/src/include/commands/typecmds.h b/src/include/commands/typecmds.h
index 0162bc2ffef..23130895af4 100644
--- a/src/include/commands/typecmds.h
+++ b/src/include/commands/typecmds.h
@@ -16,7 +16,7 @@
#include "access/htup.h"
#include "catalog/dependency.h"
-#include "nodes/parsenodes.h"
+#include "parser/parse_node.h"
#define DEFAULT_TYPDELIM ','
diff --git a/src/include/tcop/cmdtaglist.h b/src/include/tcop/cmdtaglist.h
index ed72770978b..8ef0f55e748 100644
--- a/src/include/tcop/cmdtaglist.h
+++ b/src/include/tcop/cmdtaglist.h
@@ -11,7 +11,7 @@
* Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * src/backend/tcop/cmdtaglist.h
+ * src/include/tcop/cmdtaglist.h
*
*----------------------------------------------------------------------
*/
diff --git a/src/include/utils/evtcache.h b/src/include/utils/evtcache.h
index bc8ce480615..bb1e39eb649 100644
--- a/src/include/utils/evtcache.h
+++ b/src/include/utils/evtcache.h
@@ -14,6 +14,7 @@
#ifndef EVTCACHE_H
#define EVTCACHE_H
+#include "nodes/bitmapset.h"
#include "nodes/pg_list.h"
typedef enum
diff --git a/src/tools/pginclude/cpluspluscheck b/src/tools/pginclude/cpluspluscheck
index 6f2b8b093d3..a5132cbadf2 100755
--- a/src/tools/pginclude/cpluspluscheck
+++ b/src/tools/pginclude/cpluspluscheck
@@ -107,6 +107,7 @@ do
test "$f" = src/interfaces/ecpg/preproc/c_kwlist.h && continue
test "$f" = src/interfaces/ecpg/preproc/ecpg_kwlist.h && continue
test "$f" = src/include/regex/regerrs.h && continue
+ test "$f" = src/include/tcop/cmdtaglist.h && continue
test "$f" = src/pl/plpgsql/src/plerrcodes.h && continue
test "$f" = src/pl/plpython/spiexceptions.h && continue
test "$f" = src/pl/tcl/pltclerrcodes.h && continue
diff --git a/src/tools/pginclude/headerscheck b/src/tools/pginclude/headerscheck
index c163f82b8cc..95f40820d31 100755
--- a/src/tools/pginclude/headerscheck
+++ b/src/tools/pginclude/headerscheck
@@ -103,6 +103,7 @@ do
test "$f" = src/interfaces/ecpg/preproc/c_kwlist.h && continue
test "$f" = src/interfaces/ecpg/preproc/ecpg_kwlist.h && continue
test "$f" = src/include/regex/regerrs.h && continue
+ test "$f" = src/include/tcop/cmdtaglist.h && continue
test "$f" = src/pl/plpgsql/src/plerrcodes.h && continue
test "$f" = src/pl/plpython/spiexceptions.h && continue
test "$f" = src/pl/tcl/pltclerrcodes.h && continue