diff options
124 files changed, 259 insertions, 190 deletions
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c index cf4b920f7da..c6d62e9ecc1 100644 --- a/src/backend/access/heap/heapam.c +++ b/src/backend/access/heap/heapam.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/heap/heapam.c,v 1.215 2006/07/03 22:45:37 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/access/heap/heapam.c,v 1.216 2006/07/13 16:49:12 momjian Exp $ * * * INTERFACE ROUTINES @@ -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 afe49ce6820..974ef92d187 100644 --- a/src/backend/access/nbtree/nbtinsert.c +++ b/src/backend/access/nbtree/nbtinsert.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.140 2006/07/11 21:05:57 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.141 2006/07/13 16:49:12 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 58d840cfdba..e069495f94f 100644 --- a/src/backend/access/nbtree/nbtpage.c +++ b/src/backend/access/nbtree/nbtpage.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtpage.c,v 1.97 2006/05/08 00:00:10 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtpage.c,v 1.98 2006/07/13 16:49:12 momjian Exp $ * * NOTES * Postgres btree pages look like ordinary relation pages. The opaque @@ -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 6750a982d7c..840244e597a 100644 --- a/src/backend/access/nbtree/nbtutils.c +++ b/src/backend/access/nbtree/nbtutils.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtutils.c,v 1.76 2006/07/03 22:45:37 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtutils.c,v 1.77 2006/07/13 16:49:12 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 f5416ea2087..54d6927a599 100644 --- a/src/backend/access/nbtree/nbtxlog.c +++ b/src/backend/access/nbtree/nbtxlog.c @@ -8,16 +8,16 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtxlog.c,v 1.33 2006/05/08 00:00:10 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtxlog.c,v 1.34 2006/07/13 16:49:12 momjian Exp $ * *------------------------------------------------------------------------- */ #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 49f1e72c6c8..0621d3bc604 100644 --- a/src/backend/access/transam/clog.c +++ b/src/backend/access/transam/clog.c @@ -24,7 +24,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/access/transam/clog.c,v 1.38 2006/03/24 04:32:12 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/access/transam/clog.c,v 1.39 2006/07/13 16:49:12 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 98898156cde..4eed6a64b66 100644 --- a/src/backend/access/transam/multixact.c +++ b/src/backend/access/transam/multixact.c @@ -42,7 +42,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/access/transam/multixact.c,v 1.18 2006/07/11 17:04:13 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/access/transam/multixact.c,v 1.19 2006/07/13 16:49:13 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 df0df739820..5fcef0d28a7 100644 --- a/src/backend/access/transam/slru.c +++ b/src/backend/access/transam/slru.c @@ -41,7 +41,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/access/transam/slru.c,v 1.36 2006/03/05 15:58:21 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/access/transam/slru.c,v 1.37 2006/07/13 16:49:13 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 a97bac1134f..f123962c698 100644 --- a/src/backend/access/transam/subtrans.c +++ b/src/backend/access/transam/subtrans.c @@ -22,7 +22,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/access/transam/subtrans.c,v 1.16 2006/03/05 15:58:22 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/access/transam/subtrans.c,v 1.17 2006/07/13 16:49:13 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 ad1316b75f7..70c57f301b7 100644 --- a/src/backend/access/transam/twophase.c +++ b/src/backend/access/transam/twophase.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/transam/twophase.c,v 1.19 2006/03/05 15:58:22 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/access/transam/twophase.c,v 1.20 2006/07/13 16:49:13 momjian Exp $ * * NOTES * Each global transaction is associated with a global transaction @@ -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 3716a85dfb2..03599750413 100644 --- a/src/backend/access/transam/xact.c +++ b/src/backend/access/transam/xact.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.221 2006/06/20 22:51:59 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.222 2006/07/13 16:49:13 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 3435b210a45..cc83cac16dc 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.242 2006/06/27 18:59:17 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.243 2006/07/13 16:49:13 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 28d17d052a5..7b3627f1fc3 100644 --- a/src/backend/bootstrap/bootstrap.c +++ b/src/backend/bootstrap/bootstrap.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.218 2006/06/27 22:16:43 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.219 2006/07/13 16:49:13 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 19c34bc49cf..dac2dde7691 100644 --- a/src/backend/catalog/aclchk.c +++ b/src/backend/catalog/aclchk.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/aclchk.c,v 1.128 2006/05/03 22:45:26 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/catalog/aclchk.c,v 1.129 2006/07/13 16:49:13 momjian Exp $ * * NOTES * See acl.h. @@ -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 20798fe3b1a..117440346f9 100644 --- a/src/backend/catalog/dependency.c +++ b/src/backend/catalog/dependency.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/dependency.c,v 1.56 2006/06/27 18:35:05 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/catalog/dependency.c,v 1.57 2006/07/13 16:49:13 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 f31a75b679e..8221cad72a1 100644 --- a/src/backend/catalog/heap.c +++ b/src/backend/catalog/heap.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/heap.c,v 1.307 2006/07/11 17:04:13 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/catalog/heap.c,v 1.308 2006/07/13 16:49:13 momjian Exp $ * * * INTERFACE ROUTINES @@ -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 f047f58b01f..1e498ccf755 100644 --- a/src/backend/catalog/index.c +++ b/src/backend/catalog/index.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/index.c,v 1.268 2006/07/03 22:45:37 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/catalog/index.c,v 1.269 2006/07/13 16:49:13 momjian Exp $ * * * INTERFACE ROUTINES @@ -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 2f40eca1152..e30b7770bd0 100644 --- a/src/backend/catalog/pg_aggregate.c +++ b/src/backend/catalog/pg_aggregate.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/pg_aggregate.c,v 1.79 2006/03/14 22:48:18 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/catalog/pg_aggregate.c,v 1.80 2006/07/13 16:49:13 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 c51c841800e..5ab73dbae4e 100644 --- a/src/backend/catalog/pg_operator.c +++ b/src/backend/catalog/pg_operator.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/pg_operator.c,v 1.96 2006/03/14 22:48:18 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/catalog/pg_operator.c,v 1.97 2006/07/13 16:49:13 momjian Exp $ * * NOTES * these routines moved here from commands/define.c and somewhat cleaned up. @@ -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 0379d4ff35a..0bad917d697 100644 --- a/src/backend/catalog/pg_proc.c +++ b/src/backend/catalog/pg_proc.c @@ -8,13 +8,14 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/pg_proc.c,v 1.139 2006/07/11 17:26:58 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/catalog/pg_proc.c,v 1.140 2006/07/13 16:49:13 momjian Exp $ * *------------------------------------------------------------------------- */ #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 373e7aa8f41..a5858a9a8f3 100644 --- a/src/backend/catalog/pg_shdepend.c +++ b/src/backend/catalog/pg_shdepend.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/pg_shdepend.c,v 1.10 2006/07/11 17:26:58 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/catalog/pg_shdepend.c,v 1.11 2006/07/13 16:49:13 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 35fc293de7f..a6fd1569a86 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/analyze.c,v 1.94 2006/07/10 16:20:50 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/commands/analyze.c,v 1.95 2006/07/13 16:49:13 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 969d2974615..eda4add2c4a 100644 --- a/src/backend/commands/async.c +++ b/src/backend/commands/async.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/async.c,v 1.132 2006/06/27 22:16:43 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/async.c,v 1.133 2006/07/13 16:49:14 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 fa41de3a2dc..37e8c63e9ae 100644 --- a/src/backend/commands/cluster.c +++ b/src/backend/commands/cluster.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/cluster.c,v 1.149 2006/07/03 22:45:38 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/cluster.c,v 1.150 2006/07/13 16:49:14 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 7f00ef81a7c..6cf2d085f2d 100644 --- a/src/backend/commands/copy.c +++ b/src/backend/commands/copy.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.266 2006/05/26 22:50:02 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.267 2006/07/13 16:49:14 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 6d744a5bad3..b0ffcea5850 100644 --- a/src/backend/commands/dbcommands.c +++ b/src/backend/commands/dbcommands.c @@ -13,7 +13,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/dbcommands.c,v 1.182 2006/07/10 16:20:50 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/commands/dbcommands.c,v 1.183 2006/07/13 16:49:14 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 9c71cfeea89..dba2e565373 100644 --- a/src/backend/commands/explain.c +++ b/src/backend/commands/explain.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994-5, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/explain.c,v 1.147 2006/04/08 18:49:52 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/explain.c,v 1.148 2006/07/13 16:49:14 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 3eba7e7bb7a..939d18e2ce3 100644 --- a/src/backend/commands/indexcmds.c +++ b/src/backend/commands/indexcmds.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/indexcmds.c,v 1.144 2006/07/11 17:04:13 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/indexcmds.c,v 1.145 2006/07/13 16:49:14 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 c4c55c9cf3c..7b7d9a1ccf5 100644 --- a/src/backend/commands/portalcmds.c +++ b/src/backend/commands/portalcmds.c @@ -14,7 +14,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/portalcmds.c,v 1.47 2006/06/27 02:51:39 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/portalcmds.c,v 1.48 2006/07/13 16:49:14 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 a9b61b64c4b..02c15deb488 100644 --- a/src/backend/commands/prepare.c +++ b/src/backend/commands/prepare.c @@ -10,13 +10,14 @@ * Copyright (c) 2002-2006, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/prepare.c,v 1.56 2006/07/11 17:26:58 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/prepare.c,v 1.57 2006/07/13 16:49:14 momjian Exp $ * *------------------------------------------------------------------------- */ #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 73d532da4a5..36804e53c99 100644 --- a/src/backend/commands/schemacmds.c +++ b/src/backend/commands/schemacmds.c @@ -8,13 +8,14 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/schemacmds.c,v 1.40 2006/03/14 22:48:18 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/schemacmds.c,v 1.41 2006/07/13 16:49:14 momjian Exp $ * *------------------------------------------------------------------------- */ #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 b4c26609883..6120fe37bb1 100644 --- a/src/backend/commands/sequence.c +++ b/src/backend/commands/sequence.c @@ -8,13 +8,16 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/sequence.c,v 1.135 2006/07/11 17:26:58 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/sequence.c,v 1.136 2006/07/13 16:49:14 momjian Exp $ * *------------------------------------------------------------------------- */ #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 026f6d897ca..6f620c8cb9c 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -8,15 +8,17 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.194 2006/07/11 18:26:10 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.195 2006/07/13 16:49:14 momjian Exp $ * *------------------------------------------------------------------------- */ #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 17dcf9f3a51..cbc4060c0c6 100644 --- a/src/backend/commands/tablespace.c +++ b/src/backend/commands/tablespace.c @@ -37,7 +37,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.35 2006/06/16 20:23:44 adunstan Exp $ + * $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.36 2006/07/13 16:49:14 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 361361bcf0e..9574466e1ca 100644 --- a/src/backend/commands/typecmds.c +++ b/src/backend/commands/typecmds.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/typecmds.c,v 1.93 2006/07/11 18:26:10 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/typecmds.c,v 1.94 2006/07/13 16:49:14 momjian Exp $ * * DESCRIPTION * The "DefineFoo" routines take the parse tree and pick out the @@ -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 7ae9dfdd52a..589111713b1 100644 --- a/src/backend/commands/user.c +++ b/src/backend/commands/user.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/commands/user.c,v 1.172 2006/06/20 19:56:52 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/commands/user.c,v 1.173 2006/07/13 16:49:14 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 1c66bf98f12..7e916d4e795 100644 --- a/src/backend/commands/vacuum.c +++ b/src/backend/commands/vacuum.c @@ -13,7 +13,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/vacuum.c,v 1.333 2006/07/10 16:20:50 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/commands/vacuum.c,v 1.334 2006/07/13 16:49:14 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 cc6a2a15a53..736a748fb4d 100644 --- a/src/backend/commands/vacuumlazy.c +++ b/src/backend/commands/vacuumlazy.c @@ -31,7 +31,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/vacuumlazy.c,v 1.73 2006/07/10 16:20:50 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/commands/vacuumlazy.c,v 1.74 2006/07/13 16:49:14 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 12f06b0b24d..63850cbeae7 100644 --- a/src/backend/commands/view.c +++ b/src/backend/commands/view.c @@ -8,13 +8,14 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/view.c,v 1.95 2006/07/02 02:23:20 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/view.c,v 1.96 2006/07/13 16:49:14 momjian Exp $ * *------------------------------------------------------------------------- */ #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 6ecae971d98..9972b790295 100644 --- a/src/backend/executor/execMain.c +++ b/src/backend/executor/execMain.c @@ -26,7 +26,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/execMain.c,v 1.274 2006/07/11 16:35:31 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/executor/execMain.c,v 1.275 2006/07/13 16:49:14 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 92e43c1dc57..e5f44c29c76 100644 --- a/src/backend/executor/functions.c +++ b/src/backend/executor/functions.c @@ -8,13 +8,14 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/functions.c,v 1.102 2006/04/22 01:25:58 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/executor/functions.c,v 1.103 2006/07/13 16:49:15 momjian Exp $ * *------------------------------------------------------------------------- */ #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 25d763a4f71..d36af0859fd 100644 --- a/src/backend/executor/nodeAgg.c +++ b/src/backend/executor/nodeAgg.c @@ -61,7 +61,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeAgg.c,v 1.142 2006/06/28 19:40:52 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/executor/nodeAgg.c,v 1.143 2006/07/13 16:49:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 3c8de3f5e7f..cd1c2fd8671 100644 --- a/src/backend/executor/nodeHash.c +++ b/src/backend/executor/nodeHash.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeHash.c,v 1.104 2006/06/27 21:31:20 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/executor/nodeHash.c,v 1.105 2006/07/13 16:49:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 593eff4a5f9..528408aae6b 100644 --- a/src/backend/executor/nodeSubplan.c +++ b/src/backend/executor/nodeSubplan.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeSubplan.c,v 1.76 2006/06/28 17:05:49 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/executor/nodeSubplan.c,v 1.77 2006/07/13 16:49:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 e9503638781..bc708a4509d 100644 --- a/src/backend/libpq/auth.c +++ b/src/backend/libpq/auth.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.136 2006/03/16 18:11:17 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.137 2006/07/13 16:49:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 363479d6945..26b116051f9 100644 --- a/src/backend/libpq/hba.c +++ b/src/backend/libpq/hba.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.153 2006/07/10 16:20:50 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.154 2006/07/13 16:49:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 e8857078bbb..a7700370e0e 100644 --- a/src/backend/libpq/pqcomm.c +++ b/src/backend/libpq/pqcomm.c @@ -30,7 +30,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/libpq/pqcomm.c,v 1.184 2006/03/05 15:58:27 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/libpq/pqcomm.c,v 1.185 2006/07/13 16:49:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 b83780408e5..ecfc3091776 100644 --- a/src/backend/parser/parse_clause.c +++ b/src/backend/parser/parse_clause.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/parse_clause.c,v 1.151 2006/07/03 22:45:39 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/parser/parse_clause.c,v 1.152 2006/07/13 16:49:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 bbf3c8aab7f..e94d7fb9360 100644 --- a/src/backend/parser/parse_coerce.c +++ b/src/backend/parser/parse_coerce.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/parse_coerce.c,v 2.139 2006/06/16 18:42:22 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/parser/parse_coerce.c,v 2.140 2006/07/13 16:49:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 17d221ac19b..ab4a61edfce 100644 --- a/src/backend/parser/parse_expr.c +++ b/src/backend/parser/parse_expr.c @@ -8,13 +8,14 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/parse_expr.c,v 1.193 2006/06/26 17:24:41 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/parser/parse_expr.c,v 1.194 2006/07/13 16:49:15 momjian Exp $ * *------------------------------------------------------------------------- */ #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 d7c04620b28..0b3d9d8317b 100644 --- a/src/backend/parser/parse_func.c +++ b/src/backend/parser/parse_func.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/parse_func.c,v 1.186 2006/04/15 17:45:40 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/parser/parse_func.c,v 1.187 2006/07/13 16:49:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 b96849cfa28..743ddbdf05a 100644 --- a/src/backend/parser/parse_oper.c +++ b/src/backend/parser/parse_oper.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/parse_oper.c,v 1.87 2006/05/01 23:22:43 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/parser/parse_oper.c,v 1.88 2006/07/13 16:49:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 859de3b10c6..42b46149d6a 100644 --- a/src/backend/parser/parse_target.c +++ b/src/backend/parser/parse_target.c @@ -8,12 +8,13 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/parse_target.c,v 1.144 2006/06/26 17:24:41 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/parser/parse_target.c,v 1.145 2006/07/13 16:49:15 momjian Exp $ * *------------------------------------------------------------------------- */ #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 c8b190978fe..2f0ac709cae 100644 --- a/src/backend/postmaster/autovacuum.c +++ b/src/backend/postmaster/autovacuum.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/postmaster/autovacuum.c,v 1.23 2006/07/11 16:35:32 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/autovacuum.c,v 1.24 2006/07/13 16:49:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 164c0e2ff4e..0e801746b60 100644 --- a/src/backend/postmaster/bgwriter.c +++ b/src/backend/postmaster/bgwriter.c @@ -37,7 +37,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/postmaster/bgwriter.c,v 1.24 2006/05/30 13:58:49 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/bgwriter.c,v 1.25 2006/07/13 16:49:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 cac931dc88e..21f4b042791 100644 --- a/src/backend/postmaster/pgstat.c +++ b/src/backend/postmaster/pgstat.c @@ -13,7 +13,7 @@ * * Copyright (c) 2001-2006, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.133 2006/06/29 20:00:08 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.134 2006/07/13 16:49:15 momjian Exp $ * ---------- */ #include "postgres.h" @@ -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 41edc6ed650..76de63c5fae 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -37,7 +37,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.491 2006/07/10 16:20:51 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.492 2006/07/13 16:49:16 momjian Exp $ * * NOTES * @@ -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 f899b7a0e81..5639fd44d69 100644 --- a/src/backend/storage/ipc/procarray.c +++ b/src/backend/storage/ipc/procarray.c @@ -23,13 +23,15 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/ipc/procarray.c,v 1.12 2006/06/19 01:51:21 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/storage/ipc/procarray.c,v 1.13 2006/07/13 16:49:16 momjian Exp $ * *------------------------------------------------------------------------- */ #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 f518a07f8ca..9e95af1ac2d 100644 --- a/src/backend/storage/ipc/shmem.c +++ b/src/backend/storage/ipc/shmem.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/ipc/shmem.c,v 1.91 2006/03/05 15:58:37 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/storage/ipc/shmem.c,v 1.92 2006/07/13 16:49:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 9587ebc6a7d..f640e428eb5 100644 --- a/src/backend/storage/large_object/inv_api.c +++ b/src/backend/storage/large_object/inv_api.c @@ -17,7 +17,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/large_object/inv_api.c,v 1.116 2006/04/26 00:34:57 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/storage/large_object/inv_api.c,v 1.117 2006/07/13 16:49:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 6b74c54d5ab..4f969c7dffd 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/lmgr/proc.c,v 1.175 2006/06/20 22:52:00 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/storage/lmgr/proc.c,v 1.176 2006/07/13 16:49:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 4f81f7a1eb5..bd0750af485 100644 --- a/src/backend/storage/page/itemptr.c +++ b/src/backend/storage/page/itemptr.c @@ -8,13 +8,14 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/page/itemptr.c,v 1.15 2006/03/05 15:58:39 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/storage/page/itemptr.c,v 1.16 2006/07/13 16:49:16 momjian Exp $ * *------------------------------------------------------------------------- */ #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 c982b8fb00a..ac34291d29a 100644 --- a/src/backend/tcop/fastpath.c +++ b/src/backend/tcop/fastpath.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tcop/fastpath.c,v 1.89 2006/07/11 16:35:32 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/tcop/fastpath.c,v 1.90 2006/07/13 16:49:16 momjian Exp $ * * NOTES * This cruft is the server side of PQfn. @@ -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 8427b34920d..06fa6d61995 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.490 2006/06/27 22:16:44 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.491 2006/07/13 16:49:16 momjian Exp $ * * NOTES * this is the "main" module of the postgres backend and @@ -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 261c26449ea..61f7686be1b 100644 --- a/src/backend/tcop/pquery.c +++ b/src/backend/tcop/pquery.c @@ -8,13 +8,14 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tcop/pquery.c,v 1.103 2006/07/11 17:26:59 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/tcop/pquery.c,v 1.104 2006/07/13 16:49:16 momjian Exp $ * *------------------------------------------------------------------------- */ #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 4a09bfaf6a4..37a03a46ff8 100644 --- a/src/backend/tcop/utility.c +++ b/src/backend/tcop/utility.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tcop/utility.c,v 1.260 2006/07/11 18:26:11 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/tcop/utility.c,v 1.261 2006/07/13 16:49:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 451e494a06b..19a03cee0a5 100644 --- a/src/backend/utils/adt/genfile.c +++ b/src/backend/utils/adt/genfile.c @@ -9,7 +9,7 @@ * Author: Andreas Pflug <pgadmin@pse-consulting.de> * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/genfile.c,v 1.10 2006/03/05 15:58:42 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/genfile.c,v 1.11 2006/07/13 16:49:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 e37de3dbc4b..a51cd21c659 100644 --- a/src/backend/utils/adt/misc.c +++ b/src/backend/utils/adt/misc.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/misc.c,v 1.51 2006/03/05 15:58:42 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/misc.c,v 1.52 2006/07/13 16:49:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 f4f23c9dd31..73f341a0355 100644 --- a/src/backend/utils/adt/timestamp.c +++ b/src/backend/utils/adt/timestamp.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/timestamp.c,v 1.164 2006/06/20 22:52:00 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/timestamp.c,v 1.165 2006/07/13 16:49:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 2873c77e94b..7e22eb277c7 100644 --- a/src/backend/utils/adt/varlena.c +++ b/src/backend/utils/adt/varlena.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.148 2006/06/20 19:56:52 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.149 2006/07/13 16:49:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 8d493e68611..b4591049071 100644 --- a/src/backend/utils/adt/xid.c +++ b/src/backend/utils/adt/xid.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/xid.c,v 1.8 2006/03/05 15:58:45 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/xid.c,v 1.9 2006/07/13 16:49:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 a806080fd01..88fb44456c1 100644 --- a/src/backend/utils/cache/relcache.c +++ b/src/backend/utils/cache/relcache.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/cache/relcache.c,v 1.244 2006/07/03 22:45:39 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/cache/relcache.c,v 1.245 2006/07/13 16:49:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 815cf6d138e..4e8b50f58b6 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -42,7 +42,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.171 2006/07/11 16:35:33 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.172 2006/07/13 16:49:17 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 4669fb9e9d4..1a37d111414 100644 --- a/src/backend/utils/init/flatfiles.c +++ b/src/backend/utils/init/flatfiles.c @@ -23,7 +23,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/utils/init/flatfiles.c,v 1.19 2006/07/10 16:20:51 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/utils/init/flatfiles.c,v 1.20 2006/07/13 16:49:18 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 d055129083f..191082834db 100644 --- a/src/backend/utils/init/postinit.c +++ b/src/backend/utils/init/postinit.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/init/postinit.c,v 1.168 2006/06/22 14:36:12 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/init/postinit.c,v 1.169 2006/07/13 16:49:18 momjian Exp $ * * *------------------------------------------------------------------------- @@ -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 99b1473d2ca..796401a1de0 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -10,7 +10,7 @@ * Written by Peter Eisentraut <peter_e@gmx.net>. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.326 2006/07/11 17:04:13 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.327 2006/07/13 16:49:18 momjian Exp $ * *-------------------------------------------------------------------- */ @@ -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 a32cad08d30..fe9ae72c636 100644 --- a/src/backend/utils/mmgr/portalmem.c +++ b/src/backend/utils/mmgr/portalmem.c @@ -12,13 +12,14 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mmgr/portalmem.c,v 1.88 2006/06/20 22:52:00 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/mmgr/portalmem.c,v 1.89 2006/07/13 16:49:18 momjian Exp $ * *------------------------------------------------------------------------- */ #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 a5a87b121b4..6536d04646e 100644 --- a/src/backend/utils/time/tqual.c +++ b/src/backend/utils/time/tqual.c @@ -32,7 +32,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/time/tqual.c,v 1.93 2006/03/05 15:58:49 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/time/tqual.c,v 1.94 2006/07/13 16:49:18 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 7d2f295a01d..e15f978f61a 100644 --- a/src/bin/pg_resetxlog/pg_resetxlog.c +++ b/src/bin/pg_resetxlog/pg_resetxlog.c @@ -23,7 +23,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/bin/pg_resetxlog/pg_resetxlog.c,v 1.48 2006/06/07 22:24:45 momjian Exp $ + * $PostgreSQL: pgsql/src/bin/pg_resetxlog/pg_resetxlog.c,v 1.49 2006/07/13 16:49:18 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 9a8828a33ac..1afe18dd311 100644 --- a/src/include/access/genam.h +++ b/src/include/access/genam.h @@ -7,14 +7,13 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/genam.h,v 1.62 2006/07/03 22:45:39 tgl Exp $ + * $PostgreSQL: pgsql/src/include/access/genam.h,v 1.63 2006/07/13 16:49:18 momjian Exp $ * *------------------------------------------------------------------------- */ #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 dbe369af1a8..80fa8e06982 100644 --- a/src/include/access/gistscan.h +++ b/src/include/access/gistscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/gistscan.h,v 1.29 2006/04/03 13:44:33 teodor Exp $ + * $PostgreSQL: pgsql/src/include/access/gistscan.h,v 1.30 2006/07/13 16:49:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 a845809a5dc..77ed99baa68 100644 --- a/src/include/access/hash.h +++ b/src/include/access/hash.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/hash.h,v 1.72 2006/07/11 21:05:57 tgl Exp $ + * $PostgreSQL: pgsql/src/include/access/hash.h,v 1.73 2006/07/13 16:49:19 momjian Exp $ * * NOTES * modeled after Margo Seltzer's hash implementation for unix. @@ -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 170ad657fb7..7a14fa35c22 100644 --- a/src/include/access/htup.h +++ b/src/include/access/htup.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/htup.h,v 1.83 2006/06/27 02:51:39 tgl Exp $ + * $PostgreSQL: pgsql/src/include/access/htup.h,v 1.84 2006/07/13 16:49:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 d93451a28ff..3532e3576da 100644 --- a/src/include/access/itup.h +++ b/src/include/access/itup.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/itup.h,v 1.46 2006/05/07 01:21:30 tgl Exp $ + * $PostgreSQL: pgsql/src/include/access/itup.h,v 1.47 2006/07/13 16:49:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 e7c409ed0e1..b85e373d875 100644 --- a/src/include/access/relscan.h +++ b/src/include/access/relscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/relscan.h,v 1.45 2006/05/07 01:21:30 tgl Exp $ + * $PostgreSQL: pgsql/src/include/access/relscan.h,v 1.46 2006/07/13 16:49:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 9e847e4afb3..dea48ed24cd 100644 --- a/src/include/access/tuptoaster.h +++ b/src/include/access/tuptoaster.h @@ -6,17 +6,14 @@ * * Copyright (c) 2000-2006, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/access/tuptoaster.h,v 1.26 2006/03/05 15:58:54 momjian Exp $ + * $PostgreSQL: pgsql/src/include/access/tuptoaster.h,v 1.27 2006/07/13 16:49:19 momjian Exp $ * *------------------------------------------------------------------------- */ #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 7fe6caee92f..14fac1a45ee 100644 --- a/src/include/access/twophase.h +++ b/src/include/access/twophase.h @@ -7,17 +7,17 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/twophase.h,v 1.7 2006/03/05 15:58:54 momjian Exp $ + * $PostgreSQL: pgsql/src/include/access/twophase.h,v 1.8 2006/07/13 16:49:19 momjian Exp $ * *------------------------------------------------------------------------- */ #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 bd1699f5abe..e076979a44b 100644 --- a/src/include/access/xlog.h +++ b/src/include/access/xlog.h @@ -6,13 +6,12 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/xlog.h,v 1.71 2006/03/24 04:32:13 tgl Exp $ + * $PostgreSQL: pgsql/src/include/access/xlog.h,v 1.72 2006/07/13 16:49:19 momjian Exp $ */ #ifndef XLOG_H #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 ae5b3d325d8..807f2766464 100644 --- a/src/include/bootstrap/bootstrap.h +++ b/src/include/bootstrap/bootstrap.h @@ -7,16 +7,14 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/bootstrap/bootstrap.h,v 1.41 2006/03/07 01:03:12 tgl Exp $ + * $PostgreSQL: pgsql/src/include/bootstrap/bootstrap.h,v 1.42 2006/07/13 16:49:19 momjian Exp $ * *------------------------------------------------------------------------- */ #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 09aa05f44c2..24c02cd8fcf 100644 --- a/src/include/catalog/heap.h +++ b/src/include/catalog/heap.h @@ -7,17 +7,14 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/heap.h,v 1.84 2006/07/03 22:45:40 tgl Exp $ + * $PostgreSQL: pgsql/src/include/catalog/heap.h,v 1.85 2006/07/13 16:49:19 momjian Exp $ * *------------------------------------------------------------------------- */ #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 c1af45da8d1..7d2059ed03b 100644 --- a/src/include/catalog/index.h +++ b/src/include/catalog/index.h @@ -7,15 +7,13 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/index.h,v 1.68 2006/07/03 22:45:40 tgl Exp $ + * $PostgreSQL: pgsql/src/include/catalog/index.h,v 1.69 2006/07/13 16:49:19 momjian Exp $ * *------------------------------------------------------------------------- */ #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 a6c9555cb1d..435fa572c1d 100644 --- a/src/include/catalog/pg_conversion.h +++ b/src/include/catalog/pg_conversion.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_conversion.h,v 1.17 2006/03/05 15:58:54 momjian Exp $ + * $PostgreSQL: pgsql/src/include/catalog/pg_conversion.h,v 1.18 2006/07/13 16:49:19 momjian Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -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 11c8e491fcc..8814102bfc4 100644 --- a/src/include/commands/explain.h +++ b/src/include/commands/explain.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994-5, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/commands/explain.h,v 1.26 2006/03/05 15:58:55 momjian Exp $ + * $PostgreSQL: pgsql/src/include/commands/explain.h,v 1.27 2006/07/13 16:49:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 49a822820a4..bd831c2e609 100644 --- a/src/include/commands/prepare.h +++ b/src/include/commands/prepare.h @@ -6,7 +6,7 @@ * * Copyright (c) 2002-2006, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/commands/prepare.h,v 1.20 2006/04/25 14:11:59 momjian Exp $ + * $PostgreSQL: pgsql/src/include/commands/prepare.h,v 1.21 2006/07/13 16:49:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 3452713bd0e..41c1fd9f14d 100644 --- a/src/include/commands/tablecmds.h +++ b/src/include/commands/tablecmds.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/commands/tablecmds.h,v 1.28 2006/06/27 03:43:20 momjian Exp $ + * $PostgreSQL: pgsql/src/include/commands/tablecmds.h,v 1.29 2006/07/13 16:49:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 a78ab7a7b96..f7164f21efd 100644 --- a/src/include/commands/vacuum.h +++ b/src/include/commands/vacuum.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/commands/vacuum.h,v 1.64 2006/07/10 16:20:51 alvherre Exp $ + * $PostgreSQL: pgsql/src/include/commands/vacuum.h,v 1.65 2006/07/13 16:49:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 6c3724aec7a..e2726453868 100644 --- a/src/include/executor/functions.h +++ b/src/include/executor/functions.h @@ -7,14 +7,13 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/functions.h,v 1.27 2006/03/05 15:58:56 momjian Exp $ + * $PostgreSQL: pgsql/src/include/executor/functions.h,v 1.28 2006/07/13 16:49:19 momjian Exp $ * *------------------------------------------------------------------------- */ #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 6033928cb1e..5afd7837b08 100644 --- a/src/include/executor/nodeAgg.h +++ b/src/include/executor/nodeAgg.h @@ -7,14 +7,13 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/nodeAgg.h,v 1.26 2006/03/05 15:58:56 momjian Exp $ + * $PostgreSQL: pgsql/src/include/executor/nodeAgg.h,v 1.27 2006/07/13 16:49:19 momjian Exp $ * *------------------------------------------------------------------------- */ #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 6d5bc02b93d..5e5f9b4c859 100644 --- a/src/include/executor/tuptable.h +++ b/src/include/executor/tuptable.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/tuptable.h,v 1.33 2006/06/27 21:31:20 tgl Exp $ + * $PostgreSQL: pgsql/src/include/executor/tuptable.h,v 1.34 2006/07/13 16:49:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 1c90ebb79f3..ab50079ba55 100644 --- a/src/include/libpq/libpq.h +++ b/src/include/libpq/libpq.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/libpq/libpq.h,v 1.66 2006/03/05 15:58:56 momjian Exp $ + * $PostgreSQL: pgsql/src/include/libpq/libpq.h,v 1.67 2006/07/13 16:49:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 1bedc6d26e0..12b52434e73 100644 --- a/src/include/nodes/execnodes.h +++ b/src/include/nodes/execnodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/execnodes.h,v 1.152 2006/06/28 19:40:52 tgl Exp $ + * $PostgreSQL: pgsql/src/include/nodes/execnodes.h,v 1.153 2006/07/13 16:49:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 38994eef093..9198dadf5af 100644 --- a/src/include/nodes/parsenodes.h +++ b/src/include/nodes/parsenodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/parsenodes.h,v 1.316 2006/07/13 15:09:57 neilc Exp $ + * $PostgreSQL: pgsql/src/include/nodes/parsenodes.h,v 1.317 2006/07/13 16:49:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 9c1f580fc98..e289789de86 100644 --- a/src/include/nodes/primnodes.h +++ b/src/include/nodes/primnodes.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/primnodes.h,v 1.113 2006/04/22 01:26:01 tgl Exp $ + * $PostgreSQL: pgsql/src/include/nodes/primnodes.h,v 1.114 2006/07/13 16:49:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 af54514cb0e..49f31de74f4 100644 --- a/src/include/optimizer/geqo_misc.h +++ b/src/include/optimizer/geqo_misc.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/optimizer/geqo_misc.h,v 1.28 2006/03/05 15:58:57 momjian Exp $ + * $PostgreSQL: pgsql/src/include/optimizer/geqo_misc.h,v 1.29 2006/07/13 16:49:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 70b7d074897..0c46b32e057 100644 --- a/src/include/parser/parse_coerce.h +++ b/src/include/parser/parse_coerce.h @@ -7,14 +7,13 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/parser/parse_coerce.h,v 1.62 2006/04/05 22:11:57 tgl Exp $ + * $PostgreSQL: pgsql/src/include/parser/parse_coerce.h,v 1.63 2006/07/13 16:49:19 momjian Exp $ * *------------------------------------------------------------------------- */ #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 d9b65aec8c8..2bea394a802 100644 --- a/src/include/parser/parsetree.h +++ b/src/include/parser/parsetree.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/parser/parsetree.h,v 1.33 2006/04/30 18:30:40 tgl Exp $ + * $PostgreSQL: pgsql/src/include/parser/parsetree.h,v 1.34 2006/07/13 16:49:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 fbbf35f285b..f9164e3cca7 100644 --- a/src/include/postgres.h +++ b/src/include/postgres.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1995, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/postgres.h,v 1.74 2006/03/05 15:58:53 momjian Exp $ + * $PostgreSQL: pgsql/src/include/postgres.h,v 1.75 2006/07/13 16:49:18 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 f9cced8291f..2b83c155aba 100644 --- a/src/include/storage/bufmgr.h +++ b/src/include/storage/bufmgr.h @@ -7,17 +7,14 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/bufmgr.h,v 1.100 2006/03/31 23:32:07 tgl Exp $ + * $PostgreSQL: pgsql/src/include/storage/bufmgr.h,v 1.101 2006/07/13 16:49:20 momjian Exp $ * *------------------------------------------------------------------------- */ #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 9a602879557..60f1f91c61a 100644 --- a/src/include/storage/bufpage.h +++ b/src/include/storage/bufpage.h @@ -7,17 +7,15 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/bufpage.h,v 1.67 2006/03/05 15:58:59 momjian Exp $ + * $PostgreSQL: pgsql/src/include/storage/bufpage.h,v 1.68 2006/07/13 16:49:20 momjian Exp $ * *------------------------------------------------------------------------- */ #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 636c145462f..a6801cbbb4b 100644 --- a/src/include/storage/freespace.h +++ b/src/include/storage/freespace.h @@ -7,14 +7,13 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/freespace.h,v 1.20 2006/03/05 15:58:59 momjian Exp $ + * $PostgreSQL: pgsql/src/include/storage/freespace.h,v 1.21 2006/07/13 16:49:20 momjian Exp $ * *------------------------------------------------------------------------- */ #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 d632f226bbe..f17521b516b 100644 --- a/src/include/storage/itempos.h +++ b/src/include/storage/itempos.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/itempos.h,v 1.22 2006/03/05 15:58:59 momjian Exp $ + * $PostgreSQL: pgsql/src/include/storage/itempos.h,v 1.23 2006/07/13 16:49:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 9bc5829a2fc..c5a1c1945dc 100644 --- a/src/include/storage/pos.h +++ b/src/include/storage/pos.h @@ -7,14 +7,13 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/pos.h,v 1.19 2006/03/05 15:58:59 momjian Exp $ + * $PostgreSQL: pgsql/src/include/storage/pos.h,v 1.20 2006/07/13 16:49:20 momjian Exp $ * *------------------------------------------------------------------------- */ #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 d7cc4e67320..83816dd05dd 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -7,14 +7,13 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/proc.h,v 1.88 2006/04/14 03:38:56 tgl Exp $ + * $PostgreSQL: pgsql/src/include/storage/proc.h,v 1.89 2006/07/13 16:49:20 momjian Exp $ * *------------------------------------------------------------------------- */ #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 b78da25edd1..193fe9aab57 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 93736fec6bc..44eb8e81143 100644 --- a/src/include/utils/date.h +++ b/src/include/utils/date.h @@ -7,13 +7,15 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/date.h,v 1.33 2006/03/05 15:59:07 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/date.h,v 1.34 2006/07/13 16:49:20 momjian Exp $ * *------------------------------------------------------------------------- */ #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 322a08b5dd1..131cf16ccb1 100644 --- a/src/include/utils/geo_decls.h +++ b/src/include/utils/geo_decls.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/geo_decls.h,v 1.50 2006/03/05 15:59:07 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/geo_decls.h,v 1.51 2006/07/13 16:49:20 momjian Exp $ * * NOTE * These routines do *not* use the float types from adt/. @@ -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 48632fa2076..822bcfc9835 100644 --- a/src/include/utils/guc_tables.h +++ b/src/include/utils/guc_tables.h @@ -7,13 +7,15 @@ * * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/utils/guc_tables.h,v 1.22 2006/03/05 15:59:07 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/guc_tables.h,v 1.23 2006/07/13 16:49:20 momjian Exp $ * *------------------------------------------------------------------------- */ #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 027025f939d..0b94c9c5b72 100644 --- a/src/include/utils/pg_lzcompress.h +++ b/src/include/utils/pg_lzcompress.h @@ -1,7 +1,7 @@ /* ---------- * pg_lzcompress.h - * - * $PostgreSQL: pgsql/src/include/utils/pg_lzcompress.h,v 1.11 2005/05/25 21:40:42 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/pg_lzcompress.h,v 1.12 2006/07/13 16:49:20 momjian Exp $ * * Definitions for the builtin LZ compressor * ---------- @@ -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 d9bbd44ffed..64079fa9c1f 100644 --- a/src/include/utils/portal.h +++ b/src/include/utils/portal.h @@ -39,7 +39,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/portal.h,v 1.61 2006/04/25 14:11:59 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/portal.h,v 1.62 2006/07/13 16:49:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 47832c8b3fc..2497f425614 100644 --- a/src/include/utils/timestamp.h +++ b/src/include/utils/timestamp.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/timestamp.h,v 1.61 2006/06/20 22:52:00 tgl Exp $ + * $PostgreSQL: pgsql/src/include/utils/timestamp.h,v 1.62 2006/07/13 16:49:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 10679be1611..6c1fdfd3af8 100644 --- a/src/include/utils/tqual.h +++ b/src/include/utils/tqual.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/tqual.h,v 1.61 2006/03/05 15:59:08 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/tqual.h,v 1.62 2006/07/13 16:49:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 75a12ac2290..ef33237318e 100644 --- a/src/include/utils/tuplesort.h +++ b/src/include/utils/tuplesort.h @@ -13,7 +13,7 @@ * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/tuplesort.h,v 1.21 2006/06/27 16:53:02 tgl Exp $ + * $PostgreSQL: pgsql/src/include/utils/tuplesort.h,v 1.22 2006/07/13 16:49:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 4188fe1eb1c..441e0801c9d 100644 --- a/src/pl/plpgsql/src/pl_exec.c +++ b/src/pl/plpgsql/src/pl_exec.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.173 2006/06/16 23:29:27 tgl Exp $ + * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.174 2006/07/13 16:49:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -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 b4968502ccc..e8ff412af3c 100644 --- a/src/test/regress/regress.c +++ b/src/test/regress/regress.c @@ -1,11 +1,12 @@ /* - * $PostgreSQL: pgsql/src/test/regress/regress.c,v 1.67 2006/05/30 21:21:30 tgl Exp $ + * $PostgreSQL: pgsql/src/test/regress/regress.c,v 1.68 2006/07/13 16:49:20 momjian Exp $ */ #include "postgres.h" #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() */ |