Fix up recent breakage of headerscheck and cpluspluscheck.

tglsfdc · tglsfdc · commit d0587f52b3bb · 2020-03-21T18:28:44.000-04:00
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 2f96613. 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`* Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group`
`12`	`12`	`* Portions Copyright (c) 1994, Regents of the University of California`
`13`	`13`	`*`
`14`		`- * src/backend/tcop/cmdtaglist.h`
	`14`	`+ * src/include/tcop/cmdtaglist.h`
`15`	`15`	`*`
`16`	`16`	`*----------------------------------------------------------------------`
`17`	`17`	`*/`