diff options
author | Bruce Momjian | 2006-07-13 16:49:20 +0000 |
---|---|---|
committer | Bruce Momjian | 2006-07-13 16:49:20 +0000 |
commit | 4b2b88d1dccc2015359f9a256f4f1a584f00b547 (patch) | |
tree | 65c3163f11393e6ec0644a2986dcce89f76b6d8c | |
parent | 51ad23769bef15b498a994bc982c97db67c67fee (diff) |
Allow include files to compile own their own.
Strip unused include files out unused include files, and add needed
includes to C files.
The next step is to remove unused include files in C files.
124 files changed, 136 insertions, 67 deletions
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c index 4e557ea1af..e3d8bb71f1 100644 --- a/src/backend/access/heap/heapam.c +++ b/src/backend/access/heap/heapam.c @@ -41,8 +41,10 @@ #include "access/heapam.h" #include "access/hio.h" #include "access/multixact.h" +#include "access/transam.h" #include "access/tuptoaster.h" #include "access/valid.h" +#include "access/xact.h" #include "access/xlogutils.h" #include "catalog/catalog.h" #include "catalog/namespace.h" diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c index 886413e422..21287aae04 100644 --- a/src/backend/access/nbtree/nbtinsert.c +++ b/src/backend/access/nbtree/nbtinsert.c @@ -17,6 +17,7 @@ #include "access/heapam.h" #include "access/nbtree.h" +#include "access/transam.h" #include "miscadmin.h" #include "utils/inval.h" diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c index 9e1f0a6873..0584326ba3 100644 --- a/src/backend/access/nbtree/nbtpage.c +++ b/src/backend/access/nbtree/nbtpage.c @@ -23,6 +23,7 @@ #include "postgres.h" #include "access/nbtree.h" +#include "access/transam.h" #include "miscadmin.h" #include "storage/freespace.h" #include "storage/lmgr.h" diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c index 4887c83b8c..2e03536757 100644 --- a/src/backend/access/nbtree/nbtutils.c +++ b/src/backend/access/nbtree/nbtutils.c @@ -22,6 +22,8 @@ #include "access/reloptions.h" #include "executor/execdebug.h" #include "miscadmin.h" +#include "storage/lwlock.h" +#include "storage/shmem.h" static void _bt_mark_scankey_required(ScanKey skey); diff --git a/src/backend/access/nbtree/nbtxlog.c b/src/backend/access/nbtree/nbtxlog.c index 2e65d11382..5d9cedc68e 100644 --- a/src/backend/access/nbtree/nbtxlog.c +++ b/src/backend/access/nbtree/nbtxlog.c @@ -15,9 +15,9 @@ #include "postgres.h" #include "access/nbtree.h" +#include "access/transam.h" #include "access/xlogutils.h" - /* * We must keep track of expected insertions due to page splits, and apply * them manually if they are not seen in the WAL log during replay. This diff --git a/src/backend/access/transam/clog.c b/src/backend/access/transam/clog.c index 8fefa44cc7..db8f3b5c9f 100644 --- a/src/backend/access/transam/clog.c +++ b/src/backend/access/transam/clog.c @@ -32,9 +32,9 @@ #include "access/clog.h" #include "access/slru.h" +#include "access/transam.h" #include "postmaster/bgwriter.h" - /* * Defines for CLOG page sizes. A page is the same BLCKSZ as is used * everywhere else in Postgres. diff --git a/src/backend/access/transam/multixact.c b/src/backend/access/transam/multixact.c index 6c703bf21b..bbc3b42572 100644 --- a/src/backend/access/transam/multixact.c +++ b/src/backend/access/transam/multixact.c @@ -50,6 +50,7 @@ #include "access/multixact.h" #include "access/slru.h" +#include "access/transam.h" #include "access/xact.h" #include "miscadmin.h" #include "storage/backendid.h" diff --git a/src/backend/access/transam/slru.c b/src/backend/access/transam/slru.c index e0f3bdb481..efde05fd91 100644 --- a/src/backend/access/transam/slru.c +++ b/src/backend/access/transam/slru.c @@ -51,7 +51,9 @@ #include <sys/stat.h> #include <unistd.h> +#include "access/htup.h" #include "access/slru.h" +#include "access/transam.h" #include "access/xlog.h" #include "storage/fd.h" #include "storage/shmem.h" diff --git a/src/backend/access/transam/subtrans.c b/src/backend/access/transam/subtrans.c index d7ef60913f..1354c3aa5c 100644 --- a/src/backend/access/transam/subtrans.c +++ b/src/backend/access/transam/subtrans.c @@ -30,6 +30,7 @@ #include "access/slru.h" #include "access/subtrans.h" +#include "access/transam.h" #include "utils/tqual.h" diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c index e16789aec7..7ef940fab4 100644 --- a/src/backend/access/transam/twophase.c +++ b/src/backend/access/transam/twophase.c @@ -44,6 +44,7 @@ #include "access/heapam.h" #include "access/subtrans.h" +#include "access/transam.h" #include "access/twophase.h" #include "access/twophase_rmgr.h" #include "access/xact.h" diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index d23c66a788..e53a6789b0 100644 --- a/src/backend/access/transam/xact.c +++ b/src/backend/access/transam/xact.c @@ -22,6 +22,7 @@ #include "access/multixact.h" #include "access/subtrans.h" +#include "access/transam.h" #include "access/twophase.h" #include "access/xact.h" #include "catalog/heap.h" diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 7b9990b384..3027cb8036 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -25,6 +25,7 @@ #include "access/clog.h" #include "access/multixact.h" #include "access/subtrans.h" +#include "access/transam.h" #include "access/twophase.h" #include "access/xact.h" #include "access/xlog.h" diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c index 42154b4217..97b94016f3 100644 --- a/src/backend/bootstrap/bootstrap.c +++ b/src/backend/bootstrap/bootstrap.c @@ -24,6 +24,7 @@ #include "access/genam.h" #include "access/heapam.h" +#include "access/xact.h" #include "access/xlog.h" #include "bootstrap/bootstrap.h" #include "catalog/index.h" @@ -33,6 +34,7 @@ #include "miscadmin.h" #include "nodes/makefuncs.h" #include "postmaster/bgwriter.h" +#include "pgtime.h" #include "storage/freespace.h" #include "storage/ipc.h" #include "storage/pg_shmem.h" diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c index 3a040e8df8..365d75dc5e 100644 --- a/src/backend/catalog/aclchk.c +++ b/src/backend/catalog/aclchk.c @@ -19,6 +19,7 @@ #include "access/genam.h" #include "access/heapam.h" +#include "access/xact.h" #include "catalog/catalog.h" #include "catalog/dependency.h" #include "catalog/indexing.h" diff --git a/src/backend/catalog/dependency.c b/src/backend/catalog/dependency.c index 8750758b3b..396c48abab 100644 --- a/src/backend/catalog/dependency.c +++ b/src/backend/catalog/dependency.c @@ -16,6 +16,7 @@ #include "access/genam.h" #include "access/heapam.h" +#include "access/xact.h" #include "catalog/dependency.h" #include "catalog/heap.h" #include "catalog/index.h" diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c index 1a30d9c0bc..d1708ac1c6 100644 --- a/src/backend/catalog/heap.c +++ b/src/backend/catalog/heap.c @@ -31,6 +31,8 @@ #include "access/genam.h" #include "access/heapam.h" +#include "access/transam.h" +#include "access/xact.h" #include "catalog/catalog.h" #include "catalog/dependency.h" #include "catalog/heap.h" diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c index 0fbbdca9ae..a9673d867a 100644 --- a/src/backend/catalog/index.c +++ b/src/backend/catalog/index.c @@ -25,6 +25,8 @@ #include "access/genam.h" #include "access/heapam.h" +#include "access/transam.h" +#include "access/xact.h" #include "bootstrap/bootstrap.h" #include "catalog/catalog.h" #include "catalog/dependency.h" diff --git a/src/backend/catalog/pg_aggregate.c b/src/backend/catalog/pg_aggregate.c index c6ea66bf98..85f743bf4a 100644 --- a/src/backend/catalog/pg_aggregate.c +++ b/src/backend/catalog/pg_aggregate.c @@ -22,6 +22,7 @@ #include "catalog/pg_language.h" #include "catalog/pg_operator.h" #include "catalog/pg_proc.h" +#include "catalog/pg_type.h" #include "miscadmin.h" #include "optimizer/cost.h" #include "parser/parse_coerce.h" diff --git a/src/backend/catalog/pg_operator.c b/src/backend/catalog/pg_operator.c index 3f5a1028bb..ea78699429 100644 --- a/src/backend/catalog/pg_operator.c +++ b/src/backend/catalog/pg_operator.c @@ -18,6 +18,7 @@ #include "postgres.h" #include "access/heapam.h" +#include "access/xact.h" #include "catalog/dependency.h" #include "catalog/indexing.h" #include "catalog/namespace.h" diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c index c6ee1904b3..fb0566aa54 100644 --- a/src/backend/catalog/pg_proc.c +++ b/src/backend/catalog/pg_proc.c @@ -15,6 +15,7 @@ #include "postgres.h" #include "access/heapam.h" +#include "access/xact.h" #include "catalog/dependency.h" #include "catalog/indexing.h" #include "catalog/pg_language.h" diff --git a/src/backend/catalog/pg_shdepend.c b/src/backend/catalog/pg_shdepend.c index d44ed306c8..e9d7bb96f8 100644 --- a/src/backend/catalog/pg_shdepend.c +++ b/src/backend/catalog/pg_shdepend.c @@ -16,6 +16,7 @@ #include "access/genam.h" #include "access/heapam.h" +#include "access/xact.h" #include "catalog/dependency.h" #include "catalog/indexing.h" #include "catalog/pg_authid.h" diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c index 680b234c47..268d222b60 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -17,6 +17,7 @@ #include <math.h> #include "access/heapam.h" +#include "access/transam.h" #include "access/tuptoaster.h" #include "catalog/catalog.h" #include "catalog/index.h" diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c index 3dba47b43b..569668f64c 100644 --- a/src/backend/commands/async.c +++ b/src/backend/commands/async.c @@ -79,6 +79,7 @@ #include "access/heapam.h" #include "access/twophase_rmgr.h" +#include "access/xact.h" #include "catalog/pg_listener.h" #include "commands/async.h" #include "libpq/libpq.h" diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c index 5c1b4f12eb..1870ecffce 100644 --- a/src/backend/commands/cluster.c +++ b/src/backend/commands/cluster.c @@ -19,6 +19,7 @@ #include "access/genam.h" #include "access/heapam.h" +#include "access/xact.h" #include "catalog/catalog.h" #include "catalog/dependency.h" #include "catalog/heap.h" diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c index efbcf724ea..041112aa51 100644 --- a/src/backend/commands/copy.c +++ b/src/backend/commands/copy.c @@ -23,6 +23,7 @@ #include "access/genam.h" #include "access/heapam.h" #include "access/printtup.h" +#include "access/xact.h" #include "catalog/index.h" #include "catalog/namespace.h" #include "catalog/pg_index.h" diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c index b1f2d1cfd7..6b54264ff7 100644 --- a/src/backend/commands/dbcommands.c +++ b/src/backend/commands/dbcommands.c @@ -25,6 +25,7 @@ #include "access/genam.h" #include "access/heapam.h" +#include "access/xact.h" #include "catalog/catalog.h" #include "catalog/dependency.h" #include "catalog/indexing.h" diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c index 299f0ab7f6..ece08e2e2e 100644 --- a/src/backend/commands/explain.c +++ b/src/backend/commands/explain.c @@ -15,6 +15,7 @@ #include "access/genam.h" #include "access/heapam.h" +#include "access/xact.h" #include "catalog/pg_constraint.h" #include "catalog/pg_type.h" #include "commands/explain.h" diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c index 8688bd8c9e..df209ec576 100644 --- a/src/backend/commands/indexcmds.c +++ b/src/backend/commands/indexcmds.c @@ -18,6 +18,7 @@ #include "access/genam.h" #include "access/heapam.h" #include "access/reloptions.h" +#include "access/xact.h" #include "catalog/catalog.h" #include "catalog/dependency.h" #include "catalog/heap.h" diff --git a/src/backend/commands/portalcmds.c b/src/backend/commands/portalcmds.c index 4ac12610fe..900ccfbba4 100644 --- a/src/backend/commands/portalcmds.c +++ b/src/backend/commands/portalcmds.c @@ -23,6 +23,7 @@ #include <limits.h> +#include "access/xact.h" #include "commands/portalcmds.h" #include "executor/executor.h" #include "optimizer/planner.h" diff --git a/src/backend/commands/prepare.c b/src/backend/commands/prepare.c index b2b4f9eae5..c0d0688117 100644 --- a/src/backend/commands/prepare.c +++ b/src/backend/commands/prepare.c @@ -17,6 +17,7 @@ #include "postgres.h" #include "access/heapam.h" +#include "access/xact.h" #include "catalog/pg_type.h" #include "commands/explain.h" #include "commands/prepare.h" diff --git a/src/backend/commands/schemacmds.c b/src/backend/commands/schemacmds.c index af2d7c36ab..52322c40a3 100644 --- a/src/backend/commands/schemacmds.c +++ b/src/backend/commands/schemacmds.c @@ -15,6 +15,7 @@ #include "postgres.h" #include "access/heapam.h" +#include "access/xact.h" #include "catalog/catalog.h" #include "catalog/dependency.h" #include "catalog/indexing.h" diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c index 5f2d2d267d..2a469a14bc 100644 --- a/src/backend/commands/sequence.c +++ b/src/backend/commands/sequence.c @@ -15,6 +15,9 @@ #include "postgres.h" #include "access/heapam.h" +#include "access/htup.h" +#include "access/transam.h" +#include "access/xact.h" #include "catalog/namespace.h" #include "catalog/pg_type.h" #include "commands/defrem.h" diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 773bdc622f..283489d852 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -15,8 +15,10 @@ #include "postgres.h" #include "access/genam.h" +#include "access/heapam.h" #include "access/reloptions.h" #include "access/tuptoaster.h" +#include "access/xact.h" #include "catalog/catalog.h" #include "catalog/dependency.h" #include "catalog/heap.h" diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c index 93645393a8..fd174c508f 100644 --- a/src/backend/commands/tablespace.c +++ b/src/backend/commands/tablespace.c @@ -49,6 +49,7 @@ #include <sys/stat.h> #include "access/heapam.h" +#include "access/xact.h" #include "catalog/catalog.h" #include "catalog/dependency.h" #include "catalog/indexing.h" diff --git a/src/backend/commands/typecmds.c b/src/backend/commands/typecmds.c index e641447584..f199a98d54 100644 --- a/src/backend/commands/typecmds.c +++ b/src/backend/commands/typecmds.c @@ -33,6 +33,7 @@ #include "access/genam.h" #include "access/heapam.h" +#include "access/xact.h" #include "catalog/dependency.h" #include "catalog/heap.h" #include "catalog/indexing.h" diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c index c4080c7a88..6cbb581aad 100644 --- a/src/backend/commands/user.c +++ b/src/backend/commands/user.c @@ -14,6 +14,7 @@ #include "access/genam.h" #include "access/heapam.h" +#include "access/xact.h" #include "catalog/dependency.h" #include "catalog/indexing.h" #include "catalog/pg_auth_members.h" diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c index 7f1c4a2f33..7534c85f73 100644 --- a/src/backend/commands/vacuum.c +++ b/src/backend/commands/vacuum.c @@ -27,6 +27,8 @@ #include "access/heapam.h" #include "access/multixact.h" #include "access/subtrans.h" +#include "access/transam.h" +#include "access/xact.h" #include "access/xlog.h" #include "catalog/catalog.h" #include "catalog/indexing.h" diff --git a/src/backend/commands/vacuumlazy.c b/src/backend/commands/vacuumlazy.c index 1c7bbd2da1..22e131b234 100644 --- a/src/backend/commands/vacuumlazy.c +++ b/src/backend/commands/vacuumlazy.c @@ -41,6 +41,7 @@ #include "access/genam.h" #include "access/heapam.h" +#include "access/transam.h" #include "access/xlog.h" #include "catalog/catalog.h" #include "commands/vacuum.h" diff --git a/src/backend/commands/view.c b/src/backend/commands/view.c index caed1dfcee..48e86636d6 100644 --- a/src/backend/commands/view.c +++ b/src/backend/commands/view.c @@ -15,6 +15,7 @@ #include "postgres.h" #include "access/heapam.h" +#include "access/xact.h" #include "catalog/dependency.h" #include "catalog/namespace.h" #include "commands/defrem.h" diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c index 9fd80ec7e9..495a27e24f 100644 --- a/src/backend/executor/execMain.c +++ b/src/backend/executor/execMain.c @@ -34,6 +34,8 @@ #include "access/heapam.h" #include "access/reloptions.h" +#include "access/transam.h" +#include "access/xact.h" #include "access/xlog.h" #include "catalog/heap.h" #include "catalog/namespace.h" diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c index a3855191e5..13b676b114 100644 --- a/src/backend/executor/functions.c +++ b/src/backend/executor/functions.c @@ -15,6 +15,7 @@ #include "postgres.h" #include "access/heapam.h" +#include "access/xact.h" #include "catalog/pg_proc.h" #include "catalog/pg_type.h" #include "commands/trigger.h" diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c index 105258e70c..d1951d4eb6 100644 --- a/src/backend/executor/nodeAgg.c +++ b/src/backend/executor/nodeAgg.c @@ -72,6 +72,7 @@ #include "catalog/pg_aggregate.h" #include "catalog/pg_operator.h" #include "catalog/pg_proc.h" +#include "catalog/pg_type.h" #include "executor/executor.h" #include "executor/nodeAgg.h" #include "miscadmin.h" diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c index 196751325a..2ca3f5c8fb 100644 --- a/src/backend/executor/nodeHash.c +++ b/src/backend/executor/nodeHash.c @@ -18,6 +18,9 @@ * ExecInitHash - initialize node and subnodes * ExecEndHash - shutdown node and subnodes */ + +#include <math.h> + #include "postgres.h" #include "executor/execdebug.h" diff --git a/src/backend/executor/nodeSubplan.c b/src/backend/executor/nodeSubplan.c index 39c2688de1..d38faa71a5 100644 --- a/src/backend/executor/nodeSubplan.c +++ b/src/backend/executor/nodeSubplan.c @@ -17,6 +17,8 @@ * ExecInitSubPlan - initialize a subselect * ExecEndSubPlan - shut down a subselect */ +#include <math.h> + #include "postgres.h" #include "access/heapam.h" diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c index 928ad5ec8d..c9aebcff05 100644 --- a/src/backend/libpq/auth.c +++ b/src/backend/libpq/auth.c @@ -28,6 +28,7 @@ #include "libpq/auth.h" #include "libpq/crypt.h" #include "libpq/hba.h" +#include "libpq/ip.h" #include "libpq/libpq.h" #include "libpq/pqcomm.h" #include "libpq/pqformat.h" diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c index df2cc62398..05072ef310 100644 --- a/src/backend/libpq/hba.c +++ b/src/backend/libpq/hba.c @@ -29,6 +29,7 @@ #include <arpa/inet.h> #include <unistd.h> +#include "libpq/ip.h" #include "libpq/libpq.h" #include "miscadmin.h" #include "nodes/pg_list.h" @@ -37,6 +38,7 @@ #include "utils/guc.h" + #define atooid(x) ((Oid) strtoul((x), NULL, 10)) #define atoxid(x) ((TransactionId) strtoul((x), NULL, 10)) diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c index 41d62bb4d6..c495ad0dcc 100644 --- a/src/backend/libpq/pqcomm.c +++ b/src/backend/libpq/pqcomm.c @@ -84,6 +84,7 @@ #include <utime.h> #endif +#include "libpq/ip.h" #include "libpq/libpq.h" #include "miscadmin.h" #include "storage/ipc.h" diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c index 8d3955a492..3ebef24960 100644 --- a/src/backend/parser/parse_clause.c +++ b/src/backend/parser/parse_clause.c @@ -17,6 +17,7 @@ #include "access/heapam.h" #include "catalog/heap.h" +#include "catalog/pg_type.h" #include "commands/defrem.h" #include "nodes/makefuncs.h" #include "optimizer/clauses.h" diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c index d7cc174782..78e88e23ce 100644 --- a/src/backend/parser/parse_coerce.c +++ b/src/backend/parser/parse_coerce.c @@ -16,6 +16,7 @@ #include "catalog/pg_cast.h" #include "catalog/pg_proc.h" +#include "catalog/pg_type.h" #include "nodes/makefuncs.h" #include "nodes/params.h" #include "optimizer/clauses.h" diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c index d200a1b1b0..415e55e75b 100644 --- a/src/backend/parser/parse_expr.c +++ b/src/backend/parser/parse_expr.c @@ -15,6 +15,7 @@ #include "postgres.h" +#include "catalog/pg_type.h" #include "commands/dbcommands.h" #include "mb/pg_wchar.h" #include "miscadmin.h" diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c index 68492fbb8a..c59bf0a89b 100644 --- a/src/backend/parser/parse_func.c +++ b/src/backend/parser/parse_func.c @@ -17,6 +17,7 @@ #include "access/heapam.h" #include "catalog/pg_inherits.h" #include "catalog/pg_proc.h" +#include "catalog/pg_type.h" #include "funcapi.h" #include "lib/stringinfo.h" #include "nodes/makefuncs.h" diff --git a/src/backend/parser/parse_oper.c b/src/backend/parser/parse_oper.c index d90623428d..3287051996 100644 --- a/src/backend/parser/parse_oper.c +++ b/src/backend/parser/parse_oper.c @@ -16,6 +16,7 @@ #include "postgres.h" #include "catalog/pg_operator.h" +#include "catalog/pg_type.h" #include "lib/stringinfo.h" #include "parser/parse_coerce.h" #include "parser/parse_expr.h" diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c index 82fe44b947..b40f10be75 100644 --- a/src/backend/parser/parse_target.c +++ b/src/backend/parser/parse_target.c @@ -14,6 +14,7 @@ */ #include "postgres.h" +#include "catalog/pg_type.h" #include "commands/dbcommands.h" #include "funcapi.h" #include "miscadmin.h" diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c index 0881c168e8..093d4e809a 100644 --- a/src/backend/postmaster/autovacuum.c +++ b/src/backend/postmaster/autovacuum.c @@ -23,6 +23,8 @@ #include "access/genam.h" #include "access/heapam.h" +#include "access/transam.h" +#include "access/xact.h" #include "access/xlog.h" #include "catalog/indexing.h" #include "catalog/namespace.h" diff --git a/src/backend/postmaster/bgwriter.c b/src/backend/postmaster/bgwriter.c index 7953e710ca..f1f74fc2f0 100644 --- a/src/backend/postmaster/bgwriter.c +++ b/src/backend/postmaster/bgwriter.c @@ -54,7 +54,9 @@ #include "storage/fd.h" #include "storage/freespace.h" #include "storage/ipc.h" +#include "storage/lwlock.h" #include "storage/pmsignal.h" +#include "storage/shmem.h" #include "storage/smgr.h" #include "tcop/tcopprot.h" #include "utils/guc.h" diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c index 3980ad6db6..a59f43d5c6 100644 --- a/src/backend/postmaster/pgstat.c +++ b/src/backend/postmaster/pgstat.c @@ -38,8 +38,10 @@ #include "pgstat.h" #include "access/heapam.h" +#include "access/transam.h" #include "access/xact.h" #include "catalog/pg_database.h" +#include "libpq/ip.h" #include "libpq/libpq.h" #include "libpq/pqsignal.h" #include "mb/pg_wchar.h" diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index b98cb7d5c2..a17aaf7345 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -99,6 +99,7 @@ #include "commands/async.h" #include "lib/dllist.h" #include "libpq/auth.h" +#include "libpq/ip.h" #include "libpq/libpq.h" #include "libpq/pqcomm.h" #include "libpq/pqsignal.h" diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c index c284637cca..03ec6ccbb8 100644 --- a/src/backend/storage/ipc/procarray.c +++ b/src/backend/storage/ipc/procarray.c @@ -30,6 +30,8 @@ #include "postgres.h" #include "access/subtrans.h" +#include "access/transam.h" +#include "access/xact.h" #include "access/twophase.h" #include "miscadmin.h" #include "storage/proc.h" diff --git a/src/backend/storage/ipc/shmem.c b/src/backend/storage/ipc/shmem.c index 5e66f91d6d..c4e1ac4caf 100644 --- a/src/backend/storage/ipc/shmem.c +++ b/src/backend/storage/ipc/shmem.c @@ -67,7 +67,9 @@ #include "access/transam.h" #include "miscadmin.h" +#include "storage/lwlock.h" #include "storage/pg_shmem.h" +#include "storage/shmem.h" #include "storage/spin.h" #include "utils/tqual.h" diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c index 2e801b06c0..6dc7d9a779 100644 --- a/src/backend/storage/large_object/inv_api.c +++ b/src/backend/storage/large_object/inv_api.c @@ -26,6 +26,7 @@ #include "access/genam.h" #include "access/heapam.h" #include "access/tuptoaster.h" +#include "access/xact.h" #include "catalog/catalog.h" #include "catalog/indexing.h" #include "catalog/pg_largeobject.h" diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index d7fac2c473..3380b08c81 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -35,8 +35,10 @@ #include <unistd.h> #include <sys/time.h> -#include "miscadmin.h" +#include "access/htup.h" +#include "access/transam.h" #include "access/xact.h" +#include "miscadmin.h" #include "storage/bufmgr.h" #include "storage/ipc.h" #include "storage/proc.h" diff --git a/src/backend/storage/page/itemptr.c b/src/backend/storage/page/itemptr.c index b45f12b6a2..fde3acaa0f 100644 --- a/src/backend/storage/page/itemptr.c +++ b/src/backend/storage/page/itemptr.c @@ -15,6 +15,7 @@ #include "postgres.h" #include "storage/bufpage.h" +#include "storage/itemptr.h" /* * ItemPointerEquals diff --git a/src/backend/tcop/fastpath.c b/src/backend/tcop/fastpath.c index 1924c5e929..aebce65791 100644 --- a/src/backend/tcop/fastpath.c +++ b/src/backend/tcop/fastpath.c @@ -20,6 +20,7 @@ #include <netinet/in.h> #include <arpa/inet.h> +#include "access/xact.h" #include "catalog/pg_proc.h" #include "libpq/libpq.h" #include "libpq/pqformat.h" diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index c0d1877441..60b40e3eb6 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -31,6 +31,7 @@ #endif #include "access/printtup.h" +#include "access/xact.h" #include "access/xlog.h" #include "catalog/pg_type.h" #include "commands/async.h" diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c index e4d4544554..de50d19d74 100644 --- a/src/backend/tcop/pquery.c +++ b/src/backend/tcop/pquery.c @@ -15,6 +15,7 @@ #include "postgres.h" +#include "access/xact.h" #include "commands/prepare.h" #include "commands/trigger.h" #include "executor/executor.h" diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c index 36a2016572..dd6d75bf8f 100644 --- a/src/backend/tcop/utility.c +++ b/src/backend/tcop/utility.c @@ -18,6 +18,7 @@ #include "access/heapam.h" #include "access/twophase.h" +#include "access/xact.h" #include "catalog/catalog.h" #include "catalog/namespace.h" #include "commands/alter.h" diff --git a/src/backend/utils/adt/genfile.c b/src/backend/utils/adt/genfile.c index 22facb5f7e..1c523bdadc 100644 --- a/src/backend/utils/adt/genfile.c +++ b/src/backend/utils/adt/genfile.c @@ -28,7 +28,7 @@ #include "storage/fd.h" #include "utils/builtins.h" #include "utils/memutils.h" - +#include "utils/timestamp.h" typedef struct { diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c index d3436859f6..5370605a51 100644 --- a/src/backend/utils/adt/misc.c +++ b/src/backend/utils/adt/misc.c @@ -19,6 +19,7 @@ #include <dirent.h> #include <math.h> +#include "access/xact.h" #include "catalog/pg_tablespace.h" #include "catalog/pg_type.h" #include "commands/dbcommands.h" diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c index ca4d71705e..ca46ee79e0 100644 --- a/src/backend/utils/adt/timestamp.c +++ b/src/backend/utils/adt/timestamp.c @@ -31,7 +31,6 @@ #include "utils/builtins.h" #include "utils/datetime.h" - /* * gcc's -ffast-math switch breaks routines that expect exact results from * expressions like timeval / SECS_PER_HOUR, where timeval is double. diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c index 54f24d14cd..695770b9f7 100644 --- a/src/backend/utils/adt/varlena.c +++ b/src/backend/utils/adt/varlena.c @@ -16,6 +16,7 @@ #include <ctype.h> +#include "access/tupmacs.h" #include "access/tuptoaster.h" #include "catalog/pg_type.h" #include "lib/stringinfo.h" diff --git a/src/backend/utils/adt/xid.c b/src/backend/utils/adt/xid.c index 3d5a959e5f..34ca2dc058 100644 --- a/src/backend/utils/adt/xid.c +++ b/src/backend/utils/adt/xid.c @@ -16,11 +16,11 @@ #include <limits.h> +#include "access/transam.h" #include "access/xact.h" #include "libpq/pqformat.h" #include "utils/builtins.h" - #define PG_GETARG_TRANSACTIONID(n) DatumGetTransactionId(PG_GETARG_DATUM(n)) #define PG_RETURN_TRANSACTIONID(x) return TransactionIdGetDatum(x) diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c index d89f0f2431..5abbc8d625 100644 --- a/src/backend/utils/cache/relcache.c +++ b/src/backend/utils/cache/relcache.c @@ -33,6 +33,7 @@ #include "access/genam.h" #include "access/heapam.h" #include "access/reloptions.h" +#include "access/xact.h" #include "catalog/catalog.h" #include "catalog/indexing.h" #include "catalog/namespace.h" diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c index c7ee6ac84f..247a2477de 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -57,6 +57,8 @@ #include <syslog.h> #endif +#include "access/transam.h" +#include "access/xact.h" #include "libpq/libpq.h" #include "libpq/pqformat.h" #include "mb/pg_wchar.h" diff --git a/src/backend/utils/init/flatfiles.c b/src/backend/utils/init/flatfiles.c index dee8135560..2e555e22af 100644 --- a/src/backend/utils/init/flatfiles.c +++ b/src/backend/utils/init/flatfiles.c @@ -33,7 +33,9 @@ #include <unistd.h> #include "access/heapam.h" +#include "access/transam.h" #include "access/twophase_rmgr.h" +#include "access/xact.h" #include "catalog/pg_auth_members.h" #include "catalog/pg_authid.h" #include "catalog/pg_database.h" diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c index 87eb88b7cb..e8ca18a171 100644 --- a/src/backend/utils/init/postinit.c +++ b/src/backend/utils/init/postinit.c @@ -19,6 +19,7 @@ #include <unistd.h> #include "access/heapam.h" +#include "access/xact.h" #include "catalog/catalog.h" #include "catalog/namespace.h" #include "catalog/pg_authid.h" diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 5005c975e2..08b6e3220e 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -27,6 +27,7 @@ #include "access/twophase.h" +#include "access/xact.h" #include "catalog/namespace.h" #include "catalog/pg_type.h" #include "commands/async.h" diff --git a/src/backend/utils/mmgr/portalmem.c b/src/backend/utils/mmgr/portalmem.c index 54f97ac31e..89a019be44 100644 --- a/src/backend/utils/mmgr/portalmem.c +++ b/src/backend/utils/mmgr/portalmem.c @@ -19,6 +19,7 @@ #include "postgres.h" #include "access/heapam.h" +#include "access/xact.h" #include "catalog/pg_type.h" #include "commands/portalcmds.h" #include "executor/executor.h" diff --git a/src/backend/utils/time/tqual.c b/src/backend/utils/time/tqual.c index e76e3aa1b3..fa920d9e48 100644 --- a/src/backend/utils/time/tqual.c +++ b/src/backend/utils/time/tqual.c @@ -41,6 +41,8 @@ #include "access/multixact.h" #include "access/subtrans.h" +#include "access/transam.h" +#include "access/xact.h" #include "storage/procarray.h" #include "utils/tqual.h" diff --git a/src/bin/pg_resetxlog/pg_resetxlog.c b/src/bin/pg_resetxlog/pg_resetxlog.c index 33506cb760..b8c4e815b3 100644 --- a/src/bin/pg_resetxlog/pg_resetxlog.c +++ b/src/bin/pg_resetxlog/pg_resetxlog.c @@ -40,6 +40,7 @@ #include <getopt.h> #endif +#include "access/transam.h" #include "access/multixact.h" #include "access/xlog.h" #include "access/xlog_internal.h" diff --git a/src/include/access/genam.h b/src/include/access/genam.h index 8f4f3b36a3..ed407f30cd 100644 --- a/src/include/access/genam.h +++ b/src/include/access/genam.h @@ -14,7 +14,6 @@ #ifndef GENAM_H #define GENAM_H -#include "access/itup.h" #include "access/relscan.h" #include "access/sdir.h" #include "nodes/primnodes.h" diff --git a/src/include/access/gistscan.h b/src/include/access/gistscan.h index 39eb574780..171e35b980 100644 --- a/src/include/access/gistscan.h +++ b/src/include/access/gistscan.h @@ -15,7 +15,6 @@ #define GISTSCAN_H #include "access/relscan.h" -#include "access/xlogdefs.h" extern Datum gistbeginscan(PG_FUNCTION_ARGS); extern Datum gistrescan(PG_FUNCTION_ARGS); diff --git a/src/include/access/hash.h b/src/include/access/hash.h index 75be830788..1cee4e0446 100644 --- a/src/include/access/hash.h +++ b/src/include/access/hash.h @@ -22,6 +22,7 @@ #include "access/sdir.h" #include "access/xlog.h" #include "fmgr.h" +#include "storage/lock.h" /* * Mapping from hash bucket number to physical block number of bucket's diff --git a/src/include/access/htup.h b/src/include/access/htup.h index 2da5c258ef..37f702a8b0 100644 --- a/src/include/access/htup.h +++ b/src/include/access/htup.h @@ -15,9 +15,8 @@ #define HTUP_H #include "storage/bufpage.h" +#include "storage/itemptr.h" #include "storage/relfilenode.h" -#include "access/transam.h" - /* * MaxTupleAttributeNumber limits the number of (user) columns in a tuple. diff --git a/src/include/access/itup.h b/src/include/access/itup.h index c6a668c239..2bf8ad0391 100644 --- a/src/include/access/itup.h +++ b/src/include/access/itup.h @@ -16,9 +16,9 @@ #include "access/tupdesc.h" #include "access/tupmacs.h" +#include "storage/bufpage.h" #include "storage/itemptr.h" - /* * Index tuple header structure * diff --git a/src/include/access/relscan.h b/src/include/access/relscan.h index e6fd65c5a8..4c00252bde 100644 --- a/src/include/access/relscan.h +++ b/src/include/access/relscan.h @@ -15,6 +15,7 @@ #define RELSCAN_H #include "access/skey.h" +#include "utils/rel.h" #include "utils/tqual.h" diff --git a/src/include/access/tuptoaster.h b/src/include/access/tuptoaster.h index 3836ca90e3..5e72055eca 100644 --- a/src/include/access/tuptoaster.h +++ b/src/include/access/tuptoaster.h @@ -13,10 +13,7 @@ #ifndef TUPTOASTER_H #define TUPTOASTER_H -#include "access/heapam.h" #include "access/htup.h" -#include "access/tupmacs.h" -#include "utils/rel.h" /* diff --git a/src/include/access/twophase.h b/src/include/access/twophase.h index aec9fca8ba..38a9838651 100644 --- a/src/include/access/twophase.h +++ b/src/include/access/twophase.h @@ -14,10 +14,10 @@ #ifndef TWOPHASE_H #define TWOPHASE_H +#include "access/xlogdefs.h" #include "storage/proc.h" #include "utils/timestamp.h" - /* * GlobalTransactionData is defined in twophase.c; other places have no * business knowing the internal definition. diff --git a/src/include/access/xlog.h b/src/include/access/xlog.h index c83a1f63db..f5af681002 100644 --- a/src/include/access/xlog.h +++ b/src/include/access/xlog.h @@ -12,7 +12,6 @@ #define XLOG_H #include "access/rmgr.h" -#include "access/transam.h" #include "access/xlogdefs.h" #include "lib/stringinfo.h" #include "storage/buf.h" diff --git a/src/include/bootstrap/bootstrap.h b/src/include/bootstrap/bootstrap.h index 7d7b1b6b8c..a233dc4a15 100644 --- a/src/include/bootstrap/bootstrap.h +++ b/src/include/bootstrap/bootstrap.h @@ -14,9 +14,7 @@ #ifndef BOOTSTRAP_H #define BOOTSTRAP_H -#include "access/itup.h" #include "nodes/execnodes.h" -#include "utils/rel.h" /* * MAXATTR is the maximum number of attributes in a relation supported diff --git a/src/include/catalog/heap.h b/src/include/catalog/heap.h index f2b61ef565..7db3d59518 100644 --- a/src/include/catalog/heap.h +++ b/src/include/catalog/heap.h @@ -14,10 +14,7 @@ #ifndef HEAP_H #define HEAP_H -#include "catalog/pg_attribute.h" -#include "nodes/parsenodes.h" #include "parser/parse_node.h" -#include "utils/rel.h" typedef struct RawColumnDefault diff --git a/src/include/catalog/index.h b/src/include/catalog/index.h index b065f03dbc..c619e74e11 100644 --- a/src/include/catalog/index.h +++ b/src/include/catalog/index.h @@ -14,8 +14,6 @@ #ifndef INDEX_H #define INDEX_H -#include "access/itup.h" -#include "catalog/pg_index.h" #include "nodes/execnodes.h" diff --git a/src/include/catalog/pg_conversion.h b/src/include/catalog/pg_conversion.h index 8c71f5e49e..0e1be6d1aa 100644 --- a/src/include/catalog/pg_conversion.h +++ b/src/include/catalog/pg_conversion.h @@ -82,7 +82,6 @@ typedef FormData_pg_conversion *Form_pg_conversion; /* * prototypes for functions in pg_conversion.c */ -#include "nodes/pg_list.h" #include "nodes/parsenodes.h" extern Oid ConversionCreate(const char *conname, Oid connamespace, diff --git a/src/include/commands/explain.h b/src/include/commands/explain.h index 8f460a12cf..24f53b12d5 100644 --- a/src/include/commands/explain.h +++ b/src/include/commands/explain.h @@ -14,8 +14,6 @@ #define EXPLAIN_H #include "executor/executor.h" -#include "nodes/parsenodes.h" -#include "tcop/dest.h" extern void ExplainQuery(ExplainStmt *stmt, ParamListInfo params, diff --git a/src/include/commands/prepare.h b/src/include/commands/prepare.h index d834f0c249..7883d3c4f0 100644 --- a/src/include/commands/prepare.h +++ b/src/include/commands/prepare.h @@ -14,9 +14,7 @@ #define PREPARE_H #include "executor/executor.h" -#include "nodes/parsenodes.h" -#include "tcop/dest.h" - +#include "utils/timestamp.h" /* * The data structure representing a prepared statement diff --git a/src/include/commands/tablecmds.h b/src/include/commands/tablecmds.h index ac77b14c09..6cdbf27fe7 100644 --- a/src/include/commands/tablecmds.h +++ b/src/include/commands/tablecmds.h @@ -16,7 +16,6 @@ #include "nodes/parsenodes.h" #include "utils/rel.h" -#include "access/tupdesc.h" extern Oid DefineRelation(CreateStmt *stmt, char relkind); diff --git a/src/include/commands/vacuum.h b/src/include/commands/vacuum.h index 739c922771..b5cbaaa434 100644 --- a/src/include/commands/vacuum.h +++ b/src/include/commands/vacuum.h @@ -15,12 +15,10 @@ #define VACUUM_H #include "access/htup.h" -#include "catalog/pg_attribute.h" #include "catalog/pg_statistic.h" #include "catalog/pg_type.h" #include "nodes/parsenodes.h" -#include "utils/rel.h" - +#include "storage/lock.h" /*---------- * ANALYZE builds one of these structs for each attribute (column) that is diff --git a/src/include/executor/functions.h b/src/include/executor/functions.h index 90bba3f658..b44ac97ce1 100644 --- a/src/include/executor/functions.h +++ b/src/include/executor/functions.h @@ -14,7 +14,6 @@ #ifndef FUNCTIONS_H #define FUNCTIONS_H -#include "fmgr.h" #include "nodes/execnodes.h" diff --git a/src/include/executor/nodeAgg.h b/src/include/executor/nodeAgg.h index 62c37df258..eaae379244 100644 --- a/src/include/executor/nodeAgg.h +++ b/src/include/executor/nodeAgg.h @@ -14,7 +14,6 @@ #ifndef NODEAGG_H #define NODEAGG_H -#include "fmgr.h" #include "nodes/execnodes.h" extern int ExecCountSlotsAgg(Agg *node); diff --git a/src/include/executor/tuptable.h b/src/include/executor/tuptable.h index e45e2d017f..5596ffcdb0 100644 --- a/src/include/executor/tuptable.h +++ b/src/include/executor/tuptable.h @@ -15,7 +15,6 @@ #define TUPTABLE_H #include "access/htup.h" -#include "access/tupdesc.h" /*---------- diff --git a/src/include/libpq/libpq.h b/src/include/libpq/libpq.h index d564f44706..1bf6700735 100644 --- a/src/include/libpq/libpq.h +++ b/src/include/libpq/libpq.h @@ -19,7 +19,6 @@ #include "lib/stringinfo.h" #include "libpq/libpq-be.h" -#include "libpq/ip.h" /* ---------------- * PQArgBlock diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h index c42bca169f..4501e3ef38 100644 --- a/src/include/nodes/execnodes.h +++ b/src/include/nodes/execnodes.h @@ -15,9 +15,6 @@ #define EXECNODES_H #include "access/relscan.h" -#include "executor/tuptable.h" -#include "fmgr.h" -#include "nodes/bitmapset.h" #include "nodes/params.h" #include "nodes/plannodes.h" #include "nodes/tidbitmap.h" diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h index 6ebafee3fe..14499f4566 100644 --- a/src/include/nodes/parsenodes.h +++ b/src/include/nodes/parsenodes.h @@ -15,7 +15,7 @@ #define PARSENODES_H #include "nodes/primnodes.h" - +#include "nodes/value.h" /* Possible sources of a Query */ typedef enum QuerySource diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h index d28fe12716..fa5e95dbb6 100644 --- a/src/include/nodes/primnodes.h +++ b/src/include/nodes/primnodes.h @@ -19,7 +19,6 @@ #include "access/attnum.h" #include "nodes/pg_list.h" -#include "nodes/value.h" /* ---------------------------------------------------------------- diff --git a/src/include/optimizer/geqo_misc.h b/src/include/optimizer/geqo_misc.h index 5ad587c9dc..6c13fe1657 100644 --- a/src/include/optimizer/geqo_misc.h +++ b/src/include/optimizer/geqo_misc.h @@ -22,9 +22,7 @@ #ifndef GEQO_MISC_H #define GEQO_MISC_H -#include "optimizer/geqo.h" #include "optimizer/geqo_recombination.h" -#include "nodes/relation.h" #ifdef GEQO_DEBUG diff --git a/src/include/parser/parse_coerce.h b/src/include/parser/parse_coerce.h index 238f5ab118..c6397ca217 100644 --- a/src/include/parser/parse_coerce.h +++ b/src/include/parser/parse_coerce.h @@ -14,7 +14,6 @@ #ifndef PARSE_COERCE_H #define PARSE_COERCE_H -#include "catalog/pg_type.h" #include "parser/parse_node.h" diff --git a/src/include/parser/parsetree.h b/src/include/parser/parsetree.h index 1dde4a4807..61d5f35a08 100644 --- a/src/include/parser/parsetree.h +++ b/src/include/parser/parsetree.h @@ -16,7 +16,6 @@ #define PARSETREE_H #include "nodes/parsenodes.h" -#include "nodes/pg_list.h" /* for list_nth(), etc */ /* ---------------- diff --git a/src/include/postgres.h b/src/include/postgres.h index f480513e79..adcbaff16b 100644 --- a/src/include/postgres.h +++ b/src/include/postgres.h @@ -486,11 +486,11 @@ extern DLLIMPORT bool assert_enabled; * Generates an exception if the given condition is true. */ #define Trap(condition, errorType) \ - do { \ - if ((assert_enabled) && (condition)) \ - ExceptionalCondition(CppAsString(condition), (errorType), \ - __FILE__, __LINE__); \ - } while (0) + do { \ + if ((assert_enabled) && (condition)) \ + ExceptionalCondition(CppAsString(condition), (errorType), \ + __FILE__, __LINE__); \ + } while (0) /* * TrapMacro is the same as Trap but it's intended for use in macros: diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h index c73e6ee85c..bf94dd240c 100644 --- a/src/include/storage/bufmgr.h +++ b/src/include/storage/bufmgr.h @@ -14,10 +14,7 @@ #ifndef BUFMGR_H #define BUFMGR_H -#include "access/xlogdefs.h" #include "storage/buf.h" -#include "storage/lock.h" -#include "storage/relfilenode.h" #include "utils/rel.h" typedef void *Block; diff --git a/src/include/storage/bufpage.h b/src/include/storage/bufpage.h index 3d4dac4e85..ec4838f66a 100644 --- a/src/include/storage/bufpage.h +++ b/src/include/storage/bufpage.h @@ -14,10 +14,8 @@ #ifndef BUFPAGE_H #define BUFPAGE_H -#include "storage/buf.h" #include "storage/bufmgr.h" #include "storage/item.h" -#include "storage/itemid.h" #include "storage/off.h" #include "access/xlog.h" diff --git a/src/include/storage/freespace.h b/src/include/storage/freespace.h index d2ec2a52d0..197261279e 100644 --- a/src/include/storage/freespace.h +++ b/src/include/storage/freespace.h @@ -14,7 +14,6 @@ #ifndef FREESPACE_H_ #define FREESPACE_H_ -#include "storage/block.h" #include "storage/relfilenode.h" #include "storage/itemptr.h" diff --git a/src/include/storage/itempos.h b/src/include/storage/itempos.h index b3fb411432..620600a780 100644 --- a/src/include/storage/itempos.h +++ b/src/include/storage/itempos.h @@ -39,7 +39,7 @@ typedef ItemSubpositionData *ItemSubposition; * struct objpos *OBJP; * unsigned LEN; */ -#define PSKIP(OBJP, LEN)\ +#define PSKIP(OBJP, LEN) \ do { (OBJP)->op_cp += (LEN); (OBJP)->op_len -= (LEN); } while (0) #endif /* ITEMPOS_H */ diff --git a/src/include/storage/pos.h b/src/include/storage/pos.h index 84f669f5ba..bd4ccab2b8 100644 --- a/src/include/storage/pos.h +++ b/src/include/storage/pos.h @@ -14,7 +14,6 @@ #ifndef POS_H #define POS_H -#include "storage/off.h" /* * a 'position' used to be <pagenumber, offset> in postgres. this has diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 57d4cddea4..1d1d596945 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -14,7 +14,6 @@ #ifndef _PROC_H_ #define _PROC_H_ -#include "access/xlog.h" #include "storage/lock.h" #include "storage/pg_sema.h" diff --git a/src/include/utils/cash.h b/src/include/utils/cash.h index b78da25edd..193fe9aab5 100644 --- a/src/include/utils/cash.h +++ b/src/include/utils/cash.h @@ -9,6 +9,8 @@ #ifndef CASH_H #define CASH_H +#include "fmgr.h" + /* if we store this as 4 bytes, we better make it int, not long, bjm */ typedef int32 Cash; diff --git a/src/include/utils/date.h b/src/include/utils/date.h index 94a35c8670..70a51ae8af 100644 --- a/src/include/utils/date.h +++ b/src/include/utils/date.h @@ -14,6 +14,8 @@ #ifndef DATE_H #define DATE_H +#include <math.h> + #include "fmgr.h" diff --git a/src/include/utils/geo_decls.h b/src/include/utils/geo_decls.h index 13bc469d94..c4286636ac 100644 --- a/src/include/utils/geo_decls.h +++ b/src/include/utils/geo_decls.h @@ -21,6 +21,8 @@ #ifndef GEO_DECLS_H #define GEO_DECLS_H +#include <math.h> + #include "fmgr.h" /*-------------------------------------------------------------------- diff --git a/src/include/utils/guc_tables.h b/src/include/utils/guc_tables.h index be551b8a60..f576f91dea 100644 --- a/src/include/utils/guc_tables.h +++ b/src/include/utils/guc_tables.h @@ -14,6 +14,8 @@ #ifndef GUC_TABLES_H #define GUC_TABLES_H 1 +#include "utils/guc.h" + /* * GUC supports these types of variables: */ diff --git a/src/include/utils/pg_lzcompress.h b/src/include/utils/pg_lzcompress.h index 6c07eefa0b..7de8b771c3 100644 --- a/src/include/utils/pg_lzcompress.h +++ b/src/include/utils/pg_lzcompress.h @@ -180,7 +180,8 @@ extern PGLZ_Strategy *PGLZ_strategy_never; * Initialize a decomp state from a compressed input. * ---------- */ -#define pglz_decomp_init(_ds,_lz) do { \ +#define pglz_decomp_init(_ds,_lz) \ +do { \ (_ds)->cp_in = ((unsigned char *)(_lz)) \ + sizeof(PGLZ_Header); \ (_ds)->cp_end = (_ds)->cp_in + (_lz)->varsize \ @@ -205,7 +206,8 @@ extern PGLZ_Strategy *PGLZ_strategy_never; * Deallocate resources after decompression. * ---------- */ -#define pglz_decomp_end(_ds) do { \ +#define pglz_decomp_end(_ds) \ +do { \ if ((_ds)->temp_buf != NULL) \ pfree((void *)((_ds)->temp_buf)); \ } while (0) diff --git a/src/include/utils/portal.h b/src/include/utils/portal.h index 1212cb7c8b..8d99cec647 100644 --- a/src/include/utils/portal.h +++ b/src/include/utils/portal.h @@ -49,9 +49,9 @@ #include "executor/execdesc.h" #include "nodes/memnodes.h" #include "utils/resowner.h" +#include "utils/timestamp.h" #include "utils/tuplestore.h" - /* * We have several execution strategies for Portals, depending on what * query or queries are to be executed. (Note: in all cases, a Portal diff --git a/src/include/utils/timestamp.h b/src/include/utils/timestamp.h index 61d65b0f44..24494b0d84 100644 --- a/src/include/utils/timestamp.h +++ b/src/include/utils/timestamp.h @@ -144,10 +144,12 @@ typedef struct #endif /* HAVE_INT64_TIMESTAMP */ -#define TIMESTAMP_NOBEGIN(j) do {(j) = DT_NOBEGIN;} while (0) +#define TIMESTAMP_NOBEGIN(j) \ + do {(j) = DT_NOBEGIN;} while (0) #define TIMESTAMP_IS_NOBEGIN(j) ((j) == DT_NOBEGIN) -#define TIMESTAMP_NOEND(j) do {(j) = DT_NOEND;} while (0) +#define TIMESTAMP_NOEND(j) \ + do {(j) = DT_NOEND;} while (0) #define TIMESTAMP_IS_NOEND(j) ((j) == DT_NOEND) #define TIMESTAMP_NOT_FINITE(j) (TIMESTAMP_IS_NOBEGIN(j) || TIMESTAMP_IS_NOEND(j)) diff --git a/src/include/utils/tqual.h b/src/include/utils/tqual.h index e98d09f319..eea61c657f 100644 --- a/src/include/utils/tqual.h +++ b/src/include/utils/tqual.h @@ -16,7 +16,6 @@ #define TQUAL_H #include "access/htup.h" -#include "access/xact.h" #include "storage/buf.h" diff --git a/src/include/utils/tuplesort.h b/src/include/utils/tuplesort.h index 1a6c5a20ca..b6049e8673 100644 --- a/src/include/utils/tuplesort.h +++ b/src/include/utils/tuplesort.h @@ -22,7 +22,6 @@ #include "access/itup.h" #include "executor/tuptable.h" -#include "fmgr.h" /* Tuplesortstate is an opaque type whose details are not known outside diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c index be72029322..07b5b8a548 100644 --- a/src/pl/plpgsql/src/pl_exec.c +++ b/src/pl/plpgsql/src/pl_exec.c @@ -19,6 +19,7 @@ #include <ctype.h> #include "access/heapam.h" +#include "access/transam.h" #include "catalog/pg_proc.h" #include "catalog/pg_type.h" #include "executor/spi_priv.h" diff --git a/src/test/regress/regress.c b/src/test/regress/regress.c index 2b2b8498b4..a1f9286bd8 100644 --- a/src/test/regress/regress.c +++ b/src/test/regress/regress.c @@ -6,6 +6,7 @@ #include <float.h> /* faked on sunos */ +#include "access/transam.h" #include "utils/geo_decls.h" /* includes <math.h> */ #include "executor/executor.h" /* For GetAttributeByName */ #include "commands/sequence.h" /* for nextval() */ |