Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit d0587f5

Browse files
committed
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 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.
1 parent cb2fd7e commit d0587f5

File tree

5 files changed

+5
-2
lines changed

5 files changed

+5
-2
lines changed

src/include/commands/typecmds.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#include "access/htup.h"
1818
#include "catalog/dependency.h"
19-
#include "nodes/parsenodes.h"
19+
#include "parser/parse_node.h"
2020

2121

2222
#define DEFAULT_TYPDELIM ','

src/include/tcop/cmdtaglist.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
1212
* Portions Copyright (c) 1994, Regents of the University of California
1313
*
14-
* src/backend/tcop/cmdtaglist.h
14+
* src/include/tcop/cmdtaglist.h
1515
*
1616
*----------------------------------------------------------------------
1717
*/

src/include/utils/evtcache.h

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#ifndef EVTCACHE_H
1515
#define EVTCACHE_H
1616

17+
#include "nodes/bitmapset.h"
1718
#include "nodes/pg_list.h"
1819

1920
typedef enum

src/tools/pginclude/cpluspluscheck

+1
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ do
107107
test "$f" = src/interfaces/ecpg/preproc/c_kwlist.h && continue
108108
test "$f" = src/interfaces/ecpg/preproc/ecpg_kwlist.h && continue
109109
test "$f" = src/include/regex/regerrs.h && continue
110+
test "$f" = src/include/tcop/cmdtaglist.h && continue
110111
test "$f" = src/pl/plpgsql/src/plerrcodes.h && continue
111112
test "$f" = src/pl/plpython/spiexceptions.h && continue
112113
test "$f" = src/pl/tcl/pltclerrcodes.h && continue

src/tools/pginclude/headerscheck

+1
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ do
103103
test "$f" = src/interfaces/ecpg/preproc/c_kwlist.h && continue
104104
test "$f" = src/interfaces/ecpg/preproc/ecpg_kwlist.h && continue
105105
test "$f" = src/include/regex/regerrs.h && continue
106+
test "$f" = src/include/tcop/cmdtaglist.h && continue
106107
test "$f" = src/pl/plpgsql/src/plerrcodes.h && continue
107108
test "$f" = src/pl/plpython/spiexceptions.h && continue
108109
test "$f" = src/pl/tcl/pltclerrcodes.h && continue

0 commit comments

Comments
 (0)