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.

diff --git a/src/include/commands/typecmds.h b/src/include/commands/typecmds.h
index 0162bc2ffefa501192cf29467e723caf2b68290b..23130895af4e0c550e1169e805845221f7146be9 100644 (file)
--- 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 ed72770978bde309577bf40aa83abfd309fdcaa1..8ef0f55e748768649b18d1dbce6d48ee4c6ea6c4 100644 (file)
--- 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 bc8ce480615d90d030a4fa136d28a8f86e4c714d..bb1e39eb649b291d80136428c57c0391e0fd218f 100644 (file)
--- 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 6f2b8b093d343492a05f647a2754fd5e9cd4a592..a5132cbadf2b119951ec091e900e930d746b877a 100755 (executable)
--- 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 c163f82b8cc62cee972b994e0c41ab75b53d7d15..95f40820d3134bf2d7092a5119c2c2990b28050d 100755 (executable)
--- 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