diff options
| author | Alvaro Herrera | 2012-06-25 21:45:15 +0000 |
|---|---|---|
| committer | Alvaro Herrera | 2012-06-25 22:40:40 +0000 |
| commit | 77ed0c69504aad141dea314b1de261195aae5c9e (patch) | |
| tree | c9ba75f3981e645dd3c9b4399e6e41c82c291c6b | |
| parent | eeece9e60984e76e5a41c1e2fa9efc5a1761e560 (diff) | |
Tighten up includes in sinvaladt.h, twophase.h, proc.h
Remove proc.h from sinvaladt.h and twophase.h; also replace xlog.h in
proc.h with xlogdefs.h.
| -rw-r--r-- | src/backend/access/transam/twophase.c | 1 | ||||
| -rw-r--r-- | src/backend/access/transam/xact.c | 1 | ||||
| -rw-r--r-- | src/backend/storage/ipc/ipci.c | 1 | ||||
| -rw-r--r-- | src/backend/storage/ipc/procarray.c | 1 | ||||
| -rw-r--r-- | src/backend/storage/lmgr/lock.c | 1 | ||||
| -rw-r--r-- | src/backend/storage/lmgr/predicate.c | 1 | ||||
| -rw-r--r-- | src/backend/utils/init/postinit.c | 1 | ||||
| -rw-r--r-- | src/backend/utils/misc/guc.c | 1 | ||||
| -rw-r--r-- | src/include/access/twophase.h | 4 | ||||
| -rw-r--r-- | src/include/storage/proc.h | 2 | ||||
| -rw-r--r-- | src/include/storage/sinvaladt.h | 2 |
11 files changed, 13 insertions, 3 deletions
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c index 7fbf605761..e8fb78b331 100644 --- a/src/backend/access/transam/twophase.c +++ b/src/backend/access/transam/twophase.c @@ -58,6 +58,7 @@ #include "replication/syncrep.h" #include "storage/fd.h" #include "storage/predicate.h" +#include "storage/proc.h" #include "storage/procarray.h" #include "storage/sinvaladt.h" #include "storage/smgr.h" diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index 4ba13e18ab..4755ee6ee4 100644 --- a/src/backend/access/transam/xact.c +++ b/src/backend/access/transam/xact.c @@ -40,6 +40,7 @@ #include "replication/syncrep.h" #include "storage/lmgr.h" #include "storage/predicate.h" +#include "storage/proc.h" #include "storage/procarray.h" #include "storage/sinvaladt.h" #include "storage/smgr.h" diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c index 7e04e08545..e8330e9a0c 100644 --- a/src/backend/storage/ipc/ipci.c +++ b/src/backend/storage/ipc/ipci.c @@ -33,6 +33,7 @@ #include "storage/pg_shmem.h" #include "storage/pmsignal.h" #include "storage/predicate.h" +#include "storage/proc.h" #include "storage/procarray.h" #include "storage/procsignal.h" #include "storage/sinvaladt.h" diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c index a3b0540aea..fad95ca7ce 100644 --- a/src/backend/storage/ipc/procarray.c +++ b/src/backend/storage/ipc/procarray.c @@ -51,6 +51,7 @@ #include "access/xact.h" #include "access/twophase.h" #include "miscadmin.h" +#include "storage/proc.h" #include "storage/procarray.h" #include "storage/spin.h" #include "utils/builtins.h" diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c index 98fc02529e..891dfa9e7b 100644 --- a/src/backend/storage/lmgr/lock.c +++ b/src/backend/storage/lmgr/lock.c @@ -38,6 +38,7 @@ #include "miscadmin.h" #include "pg_trace.h" #include "pgstat.h" +#include "storage/proc.h" #include "storage/sinvaladt.h" #include "storage/spin.h" #include "storage/standby.h" diff --git a/src/backend/storage/lmgr/predicate.c b/src/backend/storage/lmgr/predicate.c index 0c3c7f089b..b22faf9607 100644 --- a/src/backend/storage/lmgr/predicate.c +++ b/src/backend/storage/lmgr/predicate.c @@ -193,6 +193,7 @@ #include "storage/bufmgr.h" #include "storage/predicate.h" #include "storage/predicate_internals.h" +#include "storage/proc.h" #include "storage/procarray.h" #include "utils/rel.h" #include "utils/snapmgr.h" diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c index 1baa67da9f..4d4a895657 100644 --- a/src/backend/utils/init/postinit.c +++ b/src/backend/utils/init/postinit.c @@ -44,6 +44,7 @@ #include "storage/proc.h" #include "storage/procarray.h" #include "storage/procsignal.h" +#include "storage/proc.h" #include "storage/sinvaladt.h" #include "storage/smgr.h" #include "tcop/tcopprot.h" diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index b756e58a36..965d3252fd 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -62,6 +62,7 @@ #include "storage/bufmgr.h" #include "storage/standby.h" #include "storage/fd.h" +#include "storage/proc.h" #include "storage/predicate.h" #include "tcop/tcopprot.h" #include "tsearch/ts_cache.h" diff --git a/src/include/access/twophase.h b/src/include/access/twophase.h index 8314f85d5d..19be980659 100644 --- a/src/include/access/twophase.h +++ b/src/include/access/twophase.h @@ -14,7 +14,9 @@ #ifndef TWOPHASE_H #define TWOPHASE_H -#include "storage/proc.h" +#include "access/xlogdefs.h" +#include "datatype/timestamp.h" +#include "storage/lock.h" /* * GlobalTransactionData is defined in twophase.c; other places have no diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 71413aaf59..31f7099a63 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -14,7 +14,7 @@ #ifndef _PROC_H_ #define _PROC_H_ -#include "access/xlog.h" +#include "access/xlogdefs.h" #include "datatype/timestamp.h" #include "storage/latch.h" #include "storage/lock.h" diff --git a/src/include/storage/sinvaladt.h b/src/include/storage/sinvaladt.h index 722cc00d59..3e7b35f1b3 100644 --- a/src/include/storage/sinvaladt.h +++ b/src/include/storage/sinvaladt.h @@ -22,7 +22,7 @@ #ifndef SINVALADT_H #define SINVALADT_H -#include "storage/proc.h" +#include "storage/lock.h" #include "storage/sinval.h" /* |