diff options
Diffstat (limited to 'src/include')
43 files changed, 73 insertions, 103 deletions
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 |