From d0587f52b3bb898db3c0011954de6ae9adc076c8 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sat, 21 Mar 2020 18:28:44 -0400 Subject: [PATCH] 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. --- src/include/commands/typecmds.h | 2 +- src/include/tcop/cmdtaglist.h | 2 +- src/include/utils/evtcache.h | 1 + src/tools/pginclude/cpluspluscheck | 1 + src/tools/pginclude/headerscheck | 1 + 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/include/commands/typecmds.h b/src/include/commands/typecmds.h index 0162bc2ffe..23130895af 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 ed72770978..8ef0f55e74 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 bc8ce48061..bb1e39eb64 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 6f2b8b093d..a5132cbadf 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 c163f82b8c..95f40820d3 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 -- 2.39.5