diff options
50 files changed, 99 insertions, 93 deletions
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c index e200942d502..e5afa4167fd 100644 --- a/src/backend/access/gist/gist.c +++ b/src/backend/access/gist/gist.c @@ -6,7 +6,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/gist/gist.c,v 1.57 2000/06/14 05:24:35 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/gist/gist.c,v 1.58 2000/06/15 03:31:53 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,6 +18,7 @@ #include "access/gistscan.h" #include "access/heapam.h" #include "catalog/index.h" +#include "catalog/pg_index.h" #include "executor/executor.h" #include "miscadmin.h" #include "utils/syscache.h" diff --git a/src/backend/access/nbtree/nbtcompare.c b/src/backend/access/nbtree/nbtcompare.c index a99a61cd0f8..375fc127bb4 100644 --- a/src/backend/access/nbtree/nbtcompare.c +++ b/src/backend/access/nbtree/nbtcompare.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.36 2000/06/09 01:11:01 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.37 2000/06/15 03:31:54 momjian Exp $ * * NOTES * @@ -32,6 +32,7 @@ #include "postgres.h" +#include "utils/nabstime.h" #include "utils/builtins.h" Datum diff --git a/src/backend/access/rtree/rtget.c b/src/backend/access/rtree/rtget.c index 8854163def9..c3d83557b5f 100644 --- a/src/backend/access/rtree/rtget.c +++ b/src/backend/access/rtree/rtget.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtget.c,v 1.21 2000/06/13 07:34:48 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtget.c,v 1.22 2000/06/15 03:32:00 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,9 +16,9 @@ #include "postgres.h" #include "access/iqual.h" +#include "access/relscan.h" #include "access/rtree.h" - - +#include "storage/off.h" static OffsetNumber findnext(IndexScanDesc s, Page p, OffsetNumber n, ScanDirection dir); diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c index 67aa715da05..8423b54496e 100644 --- a/src/backend/catalog/heap.c +++ b/src/backend/catalog/heap.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.130 2000/05/30 00:49:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.131 2000/06/15 03:32:01 momjian Exp $ * * * INTERFACE ROUTINES @@ -38,6 +38,7 @@ #include "catalog/indexing.h" #include "catalog/pg_attrdef.h" #include "catalog/pg_inherits.h" +#include "catalog/pg_index.h" #include "catalog/pg_ipl.h" #include "catalog/pg_proc.h" #include "catalog/pg_relcheck.h" @@ -54,6 +55,7 @@ #include "parser/parse_expr.h" #include "parser/parse_relation.h" #include "parser/parse_target.h" +#include "parser/parse_type.h" #include "rewrite/rewriteRemove.h" #include "storage/smgr.h" #include "utils/builtins.h" diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c index 52d36477ca5..0da43af0668 100644 --- a/src/backend/catalog/index.c +++ b/src/backend/catalog/index.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.114 2000/06/08 22:36:59 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.115 2000/06/15 03:32:02 momjian Exp $ * * * INTERFACE ROUTINES @@ -29,6 +29,7 @@ #include "catalog/heap.h" #include "catalog/index.h" #include "catalog/indexing.h" +#include "catalog/pg_index.h" #include "catalog/pg_proc.h" #include "catalog/pg_type.h" #include "commands/comment.h" diff --git a/src/backend/catalog/indexing.c b/src/backend/catalog/indexing.c index e9cf37d7e38..fd94fd39d46 100644 --- a/src/backend/catalog/indexing.c +++ b/src/backend/catalog/indexing.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.64 2000/06/07 04:09:33 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.65 2000/06/15 03:32:02 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,6 +22,7 @@ #include "catalog/catname.h" #include "catalog/index.h" #include "catalog/indexing.h" +#include "catalog/pg_index.h" #include "miscadmin.h" #include "utils/fmgroids.h" #include "utils/syscache.h" diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c index 9b45576b4b9..88e0fa3568f 100644 --- a/src/backend/commands/cluster.c +++ b/src/backend/commands/cluster.c @@ -15,7 +15,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.54 2000/05/30 00:49:43 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.55 2000/06/15 03:32:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,6 +26,7 @@ #include "access/heapam.h" #include "catalog/heap.h" #include "catalog/index.h" +#include "catalog/pg_index.h" #include "catalog/pg_proc.h" #include "commands/cluster.h" #include "commands/rename.h" diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c index bb1bf1734b6..db20ca7372f 100644 --- a/src/backend/commands/copy.c +++ b/src/backend/commands/copy.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.113 2000/06/14 18:17:25 petere Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.114 2000/06/15 03:32:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,6 +21,7 @@ #include "access/heapam.h" #include "catalog/catname.h" #include "catalog/index.h" +#include "catalog/pg_index.h" #include "catalog/pg_shadow.h" #include "catalog/pg_type.h" #include "commands/copy.h" diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c index 60b31ee7159..31c96c7d6ab 100644 --- a/src/backend/commands/indexcmds.c +++ b/src/backend/commands/indexcmds.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.28 2000/05/30 00:49:43 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.29 2000/06/15 03:32:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,6 +22,7 @@ #include "catalog/index.h" #include "catalog/pg_amop.h" #include "catalog/pg_database.h" +#include "catalog/pg_index.h" #include "catalog/pg_opclass.h" #include "catalog/pg_operator.h" #include "catalog/pg_proc.h" diff --git a/src/backend/executor/execUtils.c b/src/backend/executor/execUtils.c index e8b2ef7e3ba..d6c1df135db 100644 --- a/src/backend/executor/execUtils.c +++ b/src/backend/executor/execUtils.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.57 2000/05/30 00:49:44 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.58 2000/06/15 03:32:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -48,6 +48,7 @@ #include "catalog/catname.h" #include "catalog/index.h" #include "catalog/catalog.h" +#include "catalog/pg_index.h" #include "executor/execdebug.h" #include "executor/executor.h" #include "miscadmin.h" diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c index 1999acedc12..c9d6299f493 100644 --- a/src/backend/executor/nodeAgg.c +++ b/src/backend/executor/nodeAgg.c @@ -32,7 +32,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeAgg.c,v 1.66 2000/05/30 04:24:42 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeAgg.c,v 1.67 2000/06/15 03:32:09 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -47,6 +47,7 @@ #include "optimizer/clauses.h" #include "parser/parse_expr.h" #include "parser/parse_oper.h" +#include "parser/parse_type.h" #include "utils/syscache.h" #include "utils/tuplesort.h" diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c index 3bbb03f878d..015b6b2b10a 100644 --- a/src/backend/optimizer/plan/createplan.c +++ b/src/backend/optimizer/plan/createplan.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.91 2000/06/08 22:37:11 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.92 2000/06/15 03:32:13 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,6 +18,7 @@ #include "postgres.h" +#include "catalog/pg_index.h" #include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" #include "optimizer/clauses.h" diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c index c19cc7814eb..fdb7be92447 100644 --- a/src/backend/optimizer/plan/planner.c +++ b/src/backend/optimizer/plan/planner.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.82 2000/06/09 03:17:13 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.83 2000/06/15 03:32:13 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -31,6 +31,7 @@ #include "optimizer/tlist.h" #include "optimizer/var.h" #include "parser/parse_expr.h" +#include "parser/parse_type.h" #include "utils/lsyscache.h" diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c index a34e8251fb8..12b2f26bd84 100644 --- a/src/backend/optimizer/util/plancat.c +++ b/src/backend/optimizer/util/plancat.c @@ -10,9 +10,9 @@ * * IDENTIFICATION <<<<<<< plancat.c - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.55 2000/06/09 03:17:12 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.56 2000/06/15 03:32:16 momjian Exp $ ======= - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.55 2000/06/09 03:17:12 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.56 2000/06/15 03:32:16 momjian Exp $ >>>>>>> 1.53 * *------------------------------------------------------------------------- @@ -27,6 +27,7 @@ #include "catalog/catname.h" #include "catalog/pg_amop.h" #include "catalog/pg_inherits.h" +#include "catalog/pg_index.h" #include "optimizer/plancat.h" #include "parser/parsetree.h" #include "utils/builtins.h" diff --git a/src/backend/parser/parse_agg.c b/src/backend/parser/parse_agg.c index fff451206bb..600371a09f2 100644 --- a/src/backend/parser/parse_agg.c +++ b/src/backend/parser/parse_agg.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_agg.c,v 1.37 2000/04/12 17:15:26 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_agg.c,v 1.38 2000/06/15 03:32:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,6 +21,7 @@ #include "parser/parse_coerce.h" #include "parser/parse_expr.h" #include "parser/parsetree.h" +#include "parser/parse_type.h" #include "utils/lsyscache.h" #include "utils/syscache.h" diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c index 53fa819d069..3f874cc9643 100644 --- a/src/backend/parser/parse_clause.c +++ b/src/backend/parser/parse_clause.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.64 2000/06/09 01:44:18 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.65 2000/06/15 03:32:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -25,6 +25,7 @@ #include "parser/parse_oper.h" #include "parser/parse_relation.h" #include "parser/parse_target.h" +#include "parser/parse_type.h" #define ORDER_CLAUSE 0 #define GROUP_CLAUSE 1 diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c index ec4b7e1fc71..f6e01a05ac4 100644 --- a/src/backend/parser/parse_coerce.c +++ b/src/backend/parser/parse_coerce.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.43 2000/05/30 00:49:50 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.44 2000/06/15 03:32:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -19,6 +19,7 @@ #include "parser/parse_coerce.h" #include "parser/parse_expr.h" #include "parser/parse_func.h" +#include "parser/parse_type.h" #include "utils/builtins.h" #include "utils/syscache.h" diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c index b2785f820a6..8c3e64d6d86 100644 --- a/src/backend/parser/parse_expr.c +++ b/src/backend/parser/parse_expr.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.80 2000/06/05 07:28:43 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.81 2000/06/15 03:32:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,6 +28,7 @@ #include "parser/parse_oper.h" #include "parser/parse_relation.h" #include "parser/parse_target.h" +#include "parser/parse_type.h" #include "utils/builtins.h" #include "utils/syscache.h" diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c index 541211af64d..f963b93d46f 100644 --- a/src/backend/parser/parse_func.c +++ b/src/backend/parser/parse_func.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.83 2000/06/11 20:08:00 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.84 2000/06/15 03:32:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -29,6 +29,7 @@ #include "parser/parse_expr.h" #include "parser/parse_func.h" #include "parser/parse_relation.h" +#include "parser/parse_type.h" #include "utils/acl.h" #include "utils/builtins.h" #include "utils/fmgroids.h" diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c index 96ba0d68aa6..2f076028cc9 100644 --- a/src/backend/parser/parse_target.c +++ b/src/backend/parser/parse_target.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.59 2000/05/30 00:49:50 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.60 2000/06/15 03:32:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -20,6 +20,7 @@ #include "parser/parse_func.h" #include "parser/parse_relation.h" #include "parser/parse_target.h" +#include "parser/parse_type.h" static List *ExpandAllTables(ParseState *pstate); diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c index 2fbf6bbb690..255190ebf52 100644 --- a/src/backend/rewrite/rewriteHandler.c +++ b/src/backend/rewrite/rewriteHandler.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.75 2000/06/12 19:40:42 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.76 2000/06/15 03:32:22 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,6 +26,7 @@ #include "parser/parse_oper.h" #include "parser/parse_target.h" #include "parser/parsetree.h" +#include "parser/parse_type.h" #include "rewrite/locks.h" #include "rewrite/rewriteManip.h" #include "utils/acl.h" diff --git a/src/backend/storage/file/buffile.c b/src/backend/storage/file/buffile.c index 844ba9b4e63..136f05125b7 100644 --- a/src/backend/storage/file/buffile.c +++ b/src/backend/storage/file/buffile.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/file/buffile.c,v 1.6 2000/06/08 22:37:22 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/file/buffile.c,v 1.7 2000/06/15 03:32:26 momjian Exp $ * * NOTES: * @@ -36,6 +36,7 @@ #include "postgres.h" +#include "storage/fd.h" #include "storage/buffile.h" /* diff --git a/src/backend/utils/adt/cash.c b/src/backend/utils/adt/cash.c index 15386fe20ae..484b8e8f942 100644 --- a/src/backend/utils/adt/cash.c +++ b/src/backend/utils/adt/cash.c @@ -9,11 +9,12 @@ * workings can be found in the book "Software Solutions in C" by * Dale Schumacher, Academic Press, ISBN: 0-12-632360-7. * - * $Header: /cvsroot/pgsql/src/backend/utils/adt/cash.c,v 1.39 2000/06/14 18:17:42 petere Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/cash.c,v 1.40 2000/06/15 03:32:28 momjian Exp $ */ #include <limits.h> #include <ctype.h> +#include <math.h> #include <locale.h> #include "postgres.h" diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c index 70b04da3dfa..554eaf0c390 100644 --- a/src/backend/utils/adt/date.c +++ b/src/backend/utils/adt/date.c @@ -8,21 +8,25 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.45 2000/06/09 01:11:08 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.46 2000/06/15 03:32:28 momjian Exp $ * *------------------------------------------------------------------------- */ #include <limits.h> +#include <time.h> #include "postgres.h" #ifdef HAVE_FLOAT_H #include <float.h> #endif #include "miscadmin.h" +#include "utils/date.h" +#include "utils/datetime.h" +#include "utils/nabstime.h" #include "utils/builtins.h" static int - date2tm(DateADT dateVal, int *tzp, struct tm * tm, double *fsec, char **tzn); + date2tm(DateADT dateVal, int *tzp, struct tm * tm, double *fsec, char **tzn); /***************************************************************************** diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c index 45a1ac0bb0f..8cc05351d09 100644 --- a/src/backend/utils/adt/formatting.c +++ b/src/backend/utils/adt/formatting.c @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- * formatting.c * - * $Header: /cvsroot/pgsql/src/backend/utils/adt/formatting.c,v 1.13 2000/06/14 18:17:42 petere Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/formatting.c,v 1.14 2000/06/15 03:32:28 momjian Exp $ * * * Portions Copyright (c) 1999-2000, PostgreSQL, Inc @@ -67,8 +67,11 @@ #include "postgres.h" #include "utils/builtins.h" -#include "utils/pg_locale.h" +#include "utils/date.h" +#include "utils/datetime.h" #include "utils/formatting.h" +#include "utils/int8.h" +#include "utils/pg_locale.h" /* ---------- * Routines type diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c index 088897c0682..5748986bbfe 100644 --- a/src/backend/utils/adt/numeric.c +++ b/src/backend/utils/adt/numeric.c @@ -5,7 +5,7 @@ * * 1998 Jan Wieck * - * $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.30 2000/06/14 18:17:44 petere Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.31 2000/06/15 03:32:29 momjian Exp $ * * ---------- */ @@ -19,6 +19,7 @@ #include <sys/types.h> #include "utils/builtins.h" +#include "utils/int8.h" #include "utils/numeric.h" /* ---------- diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index 5a8c745b238..5cd46bb0de2 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -15,7 +15,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.72 2000/06/14 18:17:45 petere Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.73 2000/06/15 03:32:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -37,6 +37,7 @@ #include "parser/parse_func.h" #include "parser/parse_oper.h" #include "utils/builtins.h" +#include "utils/date.h" #include "utils/int8.h" #include "utils/lsyscache.h" #include "utils/syscache.h" diff --git a/src/backend/utils/adt/varbit.c b/src/backend/utils/adt/varbit.c index cd2839c6929..3e4abe828bb 100644 --- a/src/backend/utils/adt/varbit.c +++ b/src/backend/utils/adt/varbit.c @@ -4,7 +4,7 @@ * Functions for the built-in type bit() and varying bit(). * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/varbit.c,v 1.2 2000/04/12 17:15:52 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/varbit.c,v 1.3 2000/06/15 03:32:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -33,6 +33,7 @@ #endif #include "fmgr.h" #include "utils/builtins.h" +#include "utils/varbit.h" #include "access/htup.h" /* diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c index 80d8a6a8db6..00e4c8ef39f 100644 --- a/src/backend/utils/adt/varchar.c +++ b/src/backend/utils/adt/varchar.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.64 2000/06/13 07:35:08 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.65 2000/06/15 03:32:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -16,6 +16,7 @@ #include "postgres.h" #include "catalog/pg_type.h" +#include "utils/acl.h" #include "utils/builtins.h" #include "utils/fmgroids.h" diff --git a/src/include/access/ibit.h b/src/include/access/ibit.h index 50d688d5124..3a8099e7781 100644 --- a/src/include/access/ibit.h +++ b/src/include/access/ibit.h @@ -7,15 +7,13 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: ibit.h,v 1.13 2000/04/12 17:16:26 momjian Exp $ + * $Id: ibit.h,v 1.14 2000/06/15 03:32:31 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef IBIT_H #define IBIT_H -#include "catalog/pg_index.h" - typedef struct IndexAttributeBitMapData { bits8 bits[(INDEX_MAX_KEYS + 8 - 1) / 8]; diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h index 8dc3a162a35..49d9dd07dcb 100644 --- a/src/include/access/nbtree.h +++ b/src/include/access/nbtree.h @@ -7,14 +7,13 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nbtree.h,v 1.37 2000/06/13 07:35:17 tgl Exp $ + * $Id: nbtree.h,v 1.38 2000/06/15 03:32:31 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef NBTREE_H #define NBTREE_H -#include "access/funcindex.h" #include "access/itup.h" #include "access/relscan.h" #include "access/sdir.h" diff --git a/src/include/access/rtree.h b/src/include/access/rtree.h index c5e0967f57d..70ab1526dc0 100644 --- a/src/include/access/rtree.h +++ b/src/include/access/rtree.h @@ -7,17 +7,17 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: rtree.h,v 1.18 2000/06/13 07:35:17 tgl Exp $ + * $Id: rtree.h,v 1.19 2000/06/15 03:32:31 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef RTREE_H #define RTREE_H -#include "access/funcindex.h" #include "access/itup.h" -#include "access/relscan.h" #include "access/sdir.h" +#include "access/skey.h" +#include "utils/rel.h" /* see rtstrat.c for what all this is about */ #define RTNStrategies 8 diff --git a/src/include/commands/sequence.h b/src/include/commands/sequence.h index d695caa2df9..4d1f846fa9a 100644 --- a/src/include/commands/sequence.h +++ b/src/include/commands/sequence.h @@ -9,7 +9,6 @@ #ifndef SEQUENCE_H #define SEQUENCE_H -#include "fmgr.h" #include "nodes/parsenodes.h" /* diff --git a/src/include/commands/user.h b/src/include/commands/user.h index d985d72d023..489fd98c853 100644 --- a/src/include/commands/user.h +++ b/src/include/commands/user.h @@ -3,7 +3,7 @@ * user.h * * - * $Id: user.h,v 1.12 2000/05/29 01:59:11 tgl Exp $ + * $Id: user.h,v 1.13 2000/06/15 03:32:35 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -11,7 +11,6 @@ #define USER_H #include "nodes/parsenodes.h" -#include "access/htup.h" extern void CreateUser(CreateUserStmt *stmt); extern void AlterUser(AlterUserStmt *stmt); diff --git a/src/include/executor/nodeHashjoin.h b/src/include/executor/nodeHashjoin.h index 7fed1b1f69b..33936b2d41c 100644 --- a/src/include/executor/nodeHashjoin.h +++ b/src/include/executor/nodeHashjoin.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeHashjoin.h,v 1.17 2000/01/26 05:58:05 momjian Exp $ + * $Id: nodeHashjoin.h,v 1.18 2000/06/15 03:32:36 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,7 +15,6 @@ #define NODEHASHJOIN_H #include "nodes/plannodes.h" -#include "storage/buffile.h" extern TupleTableSlot *ExecHashJoin(HashJoin *node); extern bool ExecInitHashJoin(HashJoin *node, EState *estate, Plan *parent); diff --git a/src/include/libpq/hba.h b/src/include/libpq/hba.h index 1a5021ad268..58c22331133 100644 --- a/src/include/libpq/hba.h +++ b/src/include/libpq/hba.h @@ -4,7 +4,7 @@ * Interface to hba.c * * - * $Id: hba.h,v 1.17 2000/04/12 17:16:35 momjian Exp $ + * $Id: hba.h,v 1.18 2000/06/15 03:32:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -13,8 +13,6 @@ #include <netinet/in.h> -#include "libpq/pqcomm.h" - #define CONF_FILE "pg_hba.conf" /* Name of the config file */ @@ -42,7 +40,7 @@ typedef enum UserAuth typedef struct Port hbaPort; -int hba_getauthmethod(hbaPort *port); +int hba_getauthmethod(hbaPort *port); int authident(struct sockaddr_in * raddr, struct sockaddr_in * laddr, const char *postgres_username, const char *auth_arg); diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h index 76403d495e0..3d5b2b0885a 100644 --- a/src/include/libpq/libpq-be.h +++ b/src/include/libpq/libpq-be.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: libpq-be.h,v 1.19 2000/04/12 17:16:36 momjian Exp $ + * $Id: libpq-be.h,v 1.20 2000/06/15 03:32:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -18,6 +18,7 @@ #include <sys/types.h> #include "libpq/hba.h" +#include "libpq/pqcomm.h" #ifdef USE_SSL #include <openssl/ssl.h> diff --git a/src/include/optimizer/internal.h b/src/include/optimizer/internal.h index d7ef5f7ac54..e9b0c8e4bc1 100644 --- a/src/include/optimizer/internal.h +++ b/src/include/optimizer/internal.h @@ -7,15 +7,13 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: internal.h,v 1.26 2000/01/26 05:58:20 momjian Exp $ + * $Id: internal.h,v 1.27 2000/06/15 03:32:51 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef INTERNAL_H #define INTERNAL_H -#include "catalog/pg_index.h" - /* * ---------- SHARED MACROS * diff --git a/src/include/parser/parse_expr.h b/src/include/parser/parse_expr.h index 7c76001e4ee..7f1b5d5122d 100644 --- a/src/include/parser/parse_expr.h +++ b/src/include/parser/parse_expr.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_expr.h,v 1.18 2000/03/17 05:29:07 tgl Exp $ + * $Id: parse_expr.h,v 1.19 2000/06/15 03:32:55 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,7 +15,6 @@ #define PARSE_EXPR_H #include "parser/parse_node.h" -#include "parser/parse_type.h" #define EXPR_COLUMN_FIRST 1 #define EXPR_RELATION_FIRST 2 diff --git a/src/include/regex/regex2.h b/src/include/regex/regex2.h index 25d7853c420..d6cb23a5d34 100644 --- a/src/include/regex/regex2.h +++ b/src/include/regex/regex2.h @@ -39,6 +39,8 @@ #include "postgres.h" +#include "limits.h" + /* * First, the stuff that ends up in the outside-world include file */ diff --git a/src/include/regex/utils.h b/src/include/regex/utils.h index b2e2307e1d0..461e7ad6b0e 100644 --- a/src/include/regex/utils.h +++ b/src/include/regex/utils.h @@ -39,6 +39,8 @@ #include "postgres.h" +#include "limits.h" + /* utility definitions */ #define DUPMAX 100000000 /* xxx is this right? */ #define INFINITY (DUPMAX + 1) diff --git a/src/include/storage/buffile.h b/src/include/storage/buffile.h index 078abebae54..a6f6312a7b6 100644 --- a/src/include/storage/buffile.h +++ b/src/include/storage/buffile.h @@ -18,7 +18,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: buffile.h,v 1.5 2000/06/08 22:37:54 momjian Exp $ + * $Id: buffile.h,v 1.6 2000/06/15 03:32:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -26,8 +26,6 @@ #ifndef BUFFILE_H #define BUFFILE_H -#include "storage/fd.h" - /* BufFile is an opaque type whose details are not known outside buffile.c. */ typedef struct BufFile BufFile; diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h index 38db4807c09..a72b06f3898 100644 --- a/src/include/storage/bufmgr.h +++ b/src/include/storage/bufmgr.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: bufmgr.h,v 1.38 2000/05/19 03:22:26 tgl Exp $ + * $Id: bufmgr.h,v 1.39 2000/06/15 03:33:00 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -15,11 +15,7 @@ #define BUFMGR_H -#include "storage/ipc.h" -#include "storage/block.h" -#include "storage/buf.h" #include "storage/buf_internals.h" -#include "utils/rel.h" /* * the maximum size of a disk block for any possible installation. diff --git a/src/include/storage/sinvaladt.h b/src/include/storage/sinvaladt.h index 1d49eb8c620..30fe1e06daf 100644 --- a/src/include/storage/sinvaladt.h +++ b/src/include/storage/sinvaladt.h @@ -7,14 +7,13 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: sinvaladt.h,v 1.21 2000/04/12 17:16:52 momjian Exp $ + * $Id: sinvaladt.h,v 1.22 2000/06/15 03:33:00 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef SINVALADT_H #define SINVALADT_H -#include "storage/ipc.h" #include "storage/itemptr.h" #include "storage/shmem.h" diff --git a/src/include/tcop/tcopprot.h b/src/include/tcop/tcopprot.h index a19e75a085b..6f7bdd6e4e7 100644 --- a/src/include/tcop/tcopprot.h +++ b/src/include/tcop/tcopprot.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tcopprot.h,v 1.29 2000/06/08 22:37:56 momjian Exp $ + * $Id: tcopprot.h,v 1.30 2000/06/15 03:33:04 momjian Exp $ * * OLD COMMENTS * This file was created so that other c files could get the two @@ -21,7 +21,6 @@ #include <setjmp.h> #include "executor/execdesc.h" -#include "parser/parse_node.h" extern DLLIMPORT sigjmp_buf Warn_restart; extern bool Warn_restart_ready; diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h index 6c4071fd5d8..785c5a15bd0 100644 --- a/src/include/utils/builtins.h +++ b/src/include/utils/builtins.h @@ -7,27 +7,19 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: builtins.h,v 1.116 2000/06/13 07:35:30 tgl Exp $ + * $Id: builtins.h,v 1.117 2000/06/15 03:33:10 momjian Exp $ * *------------------------------------------------------------------------- */ #ifndef BUILTINS_H #define BUILTINS_H -#include "fmgr.h" #include "nodes/relation.h" /* for amcostestimate parameters */ #include "storage/itemptr.h" -#include "utils/array.h" #include "utils/inet.h" -#include "utils/int8.h" #include "utils/geo_decls.h" #include "utils/numeric.h" -#include "utils/datetime.h" -#include "utils/timestamp.h" -#include "utils/nabstime.h" -#include "utils/date.h" #include "utils/lztext.h" -#include "utils/varbit.h" /* * Defined in adt/ diff --git a/src/include/utils/catcache.h b/src/include/utils/catcache.h index 31ec660b9a3..e2f92df1474 100644 --- a/src/include/utils/catcache.h +++ b/src/include/utils/catcache.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: catcache.h,v 1.22 2000/06/05 07:29:07 tgl Exp $ + * $Id: catcache.h,v 1.23 2000/06/15 03:33:10 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -17,7 +17,6 @@ /* #define CACHEDEBUG turns DEBUG elogs on */ #include "access/htup.h" -#include "fmgr.h" #include "lib/dllist.h" /* diff --git a/src/include/utils/ps_status.h b/src/include/utils/ps_status.h index 90f088ea2d0..a981fc398b1 100644 --- a/src/include/utils/ps_status.h +++ b/src/include/utils/ps_status.h @@ -10,8 +10,6 @@ #ifndef PS_STATUS_H #define PS_STATUS_H -#include "libpq/libpq-be.h" - void init_ps_display(int argc, char *argv[], const char * username, const char * dbname, diff --git a/src/include/utils/tuplesort.h b/src/include/utils/tuplesort.h index 6b54eb9f0b9..ffffe15f1b6 100644 --- a/src/include/utils/tuplesort.h +++ b/src/include/utils/tuplesort.h @@ -13,7 +13,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: tuplesort.h,v 1.4 2000/04/12 17:16:56 momjian Exp $ + * $Id: tuplesort.h,v 1.5 2000/06/15 03:33:11 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,9 +22,6 @@ #include "access/htup.h" #include "access/itup.h" -#include "access/skey.h" -#include "access/tupdesc.h" -#include "utils/rel.h" /* Tuplesortstate is an opaque type whose details are not known outside tuplesort.c. */ diff --git a/src/tools/pginclude/pgrminclude b/src/tools/pginclude/pgrminclude index e91997bc3f5..60839c15dca 100755 --- a/src/tools/pginclude/pgrminclude +++ b/src/tools/pginclude/pgrminclude @@ -12,12 +12,15 @@ do then IS_INCLUDE="Y" else IS_INCLUDE="N" fi - + + # remove defines if [ "$IS_INCLUDE" = "Y" ] then cat "$FILE" | grep -v "^#if" | grep -v "^#else" | grep -v "^#endif" | sed 's/->[a-zA-Z0-9_\.]*//g' >/tmp/$$a else cat "$FILE" >/tmp/$$a fi + + # loop through all includes cat /tmp/$$a | grep "^#include" | sed 's/^#include[ ]*[<"]\([^>"]*\).*$/\1/g' | while read INCLUDE @@ -26,11 +29,14 @@ do [ "$INCLUDE" = postgres.h ] && continue [ "$INCLUDE" = config.h ] && continue [ "$INCLUDE" = c.h ] && continue + # preserve configure-specific includes + # these includes are surrounded by #ifdef's grep -B1 '^#include[ ][ ]*[<"]'"$INCLUDE"'[>"]' "$FILE" | egrep -q '^#if|^#else' && continue grep -A1 '^#include[ ][ ]*[<"]'"$INCLUDE"'[>"]' "$FILE" | egrep -q '^#else|^#endif' && continue + cat /tmp/$$a | grep -v '^#include[ ]*[<"]'"$INCLUDE"'[>"]' >/tmp/$$b if [ "$IS_INCLUDE" = "Y" ] @@ -50,12 +56,6 @@ do if [ "$IS_INCLUDE" = "N" ] then grep -v '^#include[ ][ ]*[<"]'"$INCLUDE"'[>"]' "$FILE" >/tmp/$$b mv /tmp/$$b "$FILE" - # reload after #include removal - if [ "$IS_INCLUDE" = "Y" ] - then cat "$FILE" | grep -v "^#if" | grep -v "^#else" | - grep -v "^#endif" | sed 's/->[a-zA-Z0-9_\.]*//g' >/tmp/$$a - else cat "$FILE" >/tmp/$$a - fi fi if [ "$1" = "-v" ] then cat /tmp/$$ |