diff options
| author | Robert Haas | 2016-09-13 13:21:35 +0000 |
|---|---|---|
| committer | Robert Haas | 2016-09-13 13:21:35 +0000 |
| commit | 445a38aba26cb80a4506af2248e3b425f795a099 (patch) | |
| tree | 124850dca84e3f8c0114a8a3d1f216488ea8cabb | |
| parent | 0dba54f1666ead71c54ce100b39efda67596d297 (diff) | |
Have heapam.h include lockdefs.h rather than lock.h.
lockdefs.h was only split from lock.h relatively recently, and
represents a minimal subset of the old lock.h. heapam.h only needs
that smaller subset, so adjust it to include only that. This requires
some corresponding adjustments elsewhere.
Peter Geoghegan
| -rw-r--r-- | src/backend/access/heap/syncscan.c | 2 | ||||
| -rw-r--r-- | src/backend/access/transam/commit_ts.c | 1 | ||||
| -rw-r--r-- | src/include/access/heapam.h | 2 | ||||
| -rw-r--r-- | src/include/access/relscan.h | 1 | ||||
| -rw-r--r-- | src/include/nodes/execnodes.h | 1 |
5 files changed, 6 insertions, 1 deletions
diff --git a/src/backend/access/heap/syncscan.c b/src/backend/access/heap/syncscan.c index a0f500edc88..8cc052eb7df 100644 --- a/src/backend/access/heap/syncscan.c +++ b/src/backend/access/heap/syncscan.c @@ -48,6 +48,8 @@ #include "access/heapam.h" #include "miscadmin.h" +#include "storage/lwlock.h" +#include "storage/shmem.h" #include "utils/rel.h" diff --git a/src/backend/access/transam/commit_ts.c b/src/backend/access/transam/commit_ts.c index e330105217d..a8d275f4d39 100644 --- a/src/backend/access/transam/commit_ts.c +++ b/src/backend/access/transam/commit_ts.c @@ -32,6 +32,7 @@ #include "funcapi.h" #include "miscadmin.h" #include "pg_trace.h" +#include "storage/shmem.h" #include "utils/builtins.h" #include "utils/snapmgr.h" #include "utils/timestamp.h" diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h index b3a595c67e9..0d12bbbbeaf 100644 --- a/src/include/access/heapam.h +++ b/src/include/access/heapam.h @@ -19,7 +19,7 @@ #include "nodes/lockoptions.h" #include "nodes/primnodes.h" #include "storage/bufpage.h" -#include "storage/lock.h" +#include "storage/lockdefs.h" #include "utils/relcache.h" #include "utils/snapshot.h" diff --git a/src/include/access/relscan.h b/src/include/access/relscan.h index 49c2a6f2ce2..de98dd65981 100644 --- a/src/include/access/relscan.h +++ b/src/include/access/relscan.h @@ -19,6 +19,7 @@ #include "access/htup_details.h" #include "access/itup.h" #include "access/tupdesc.h" +#include "storage/spin.h" /* * Shared state for parallel heap scan. diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h index e28477d82db..4fa366178f5 100644 --- a/src/include/nodes/execnodes.h +++ b/src/include/nodes/execnodes.h @@ -20,6 +20,7 @@ #include "lib/pairingheap.h" #include "nodes/params.h" #include "nodes/plannodes.h" +#include "utils/hsearch.h" #include "utils/reltrigger.h" #include "utils/sortsupport.h" #include "utils/tuplestore.h" |