diff --git a/src/backend/commands/_deadcode/version.c b/src/backend/commands/_deadcode/version.c index 9d178e877c74675a51bc6ffb140e19ed29fd6714..bfc657778dfa284e9bdd6beaa77d6850b39820fa 100644 --- a/src/backend/commands/_deadcode/version.c +++ b/src/backend/commands/_deadcode/version.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/version.c,v 1.2 1996/11/03 23:57:42 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/version.c,v 1.3 1996/11/06 08:21:42 scrappy Exp $ * * NOTES * At the point the version is defined, 2 physical relations are created @@ -24,13 +24,13 @@ #include <stdio.h> #include <string.h> -#include "postgres.h" +#include <postgres.h> -#include "access/heapam.h" -#include "utils/builtins.h" -#include "commands/version.h" -#include "access/xact.h" /* for GetCurrentXactStartTime */ -#include "tcop/tcopprot.h" +#include <access/heapam.h> +#include <utils/builtins.h> +#include <commands/version.h> +#include <access/xact.h> /* for GetCurrentXactStartTime */ +#include <tcop/tcopprot.h> #define MAX_QUERY_LEN 1024 diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c index cb02d50104772d28e5e512c782efb421ad47216a..2bda8a0765c832a0464fce3d078ba638b4e98e6f 100644 --- a/src/backend/commands/async.c +++ b/src/backend/commands/async.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.5 1996/11/03 23:57:19 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.6 1996/11/06 08:21:26 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -58,36 +58,28 @@ * #4,#5 are changing soon with pending rewrite of portal/protocol. * */ - -#include "postgres.h" - -#include "utils/syscache.h" -#include "access/relscan.h" -#include "access/xact.h" -#include "lib/dllist.h" -#include "utils/palloc.h" - -#include "tcop/dest.h" -#include "catalog/pg_proc.h" -#include "catalog/catname.h" -#include "catalog/pg_listener.h" - -#include "access/heapam.h" - -#include "storage/bufmgr.h" - -#include "nodes/memnodes.h" -#include "utils/mcxt.h" -#include "commands/async.h" - #include <unistd.h> #include <signal.h> #include <string.h> #include <errno.h> - #include <netinet/in.h> -#include "libpq/libpq.h" +#include <postgres.h> + +#include <utils/syscache.h> +#include <access/relscan.h> +#include <access/xact.h> +#include <lib/dllist.h> +#include <tcop/dest.h> +#include <catalog/pg_proc.h> +#include <catalog/catname.h> +#include <catalog/pg_listener.h> +#include <access/heapam.h> +#include <storage/bufmgr.h> +#include <nodes/memnodes.h> +#include <utils/mcxt.h> +#include <commands/async.h> +#include <libpq/libpq.h> static int notifyFrontEndPending = 0; static int notifyIssued = 0; diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c index 17369934606829d90cbd066869ab6eab63f4b3e9..4d82e2c8645fcf27b1d7b689a86443174b89052c 100644 --- a/src/backend/commands/cluster.c +++ b/src/backend/commands/cluster.c @@ -14,50 +14,37 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.7 1996/11/03 23:57:20 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.8 1996/11/06 08:21:29 scrappy Exp $ * *------------------------------------------------------------------------- */ -#include <string.h> -#include <stdio.h> - -#include "postgres.h" - -#include "access/heapam.h" -#include "access/genam.h" -#include "access/htup.h" -#include "access/skey.h" -#include "access/xact.h" - -#include "catalog/catname.h" -#include "utils/syscache.h" -#include "catalog/index.h" -#include "catalog/indexing.h" -#include "catalog/pg_type.h" - -#include "commands/copy.h" -#include "commands/cluster.h" -#include "commands/rename.h" - -#include "storage/bufmgr.h" - -#include "miscadmin.h" -#include "tcop/dest.h" -#include "commands/command.h" - -#include "utils/builtins.h" -#include "utils/excid.h" -#include "utils/mcxt.h" -#include "utils/palloc.h" - -#include "catalog/pg_proc.h" -#include "catalog/pg_class.h" - -#include "optimizer/internal.h" - +#include <postgres.h> + +#include <catalog/pg_index.h> +#include <catalog/heap.h> +#include <access/heapam.h> +#include <access/genam.h> +#include <access/xact.h> +#include <catalog/catname.h> +#include <utils/syscache.h> +#include <catalog/index.h> +#include <catalog/indexing.h> +#include <catalog/pg_type.h> +#include <commands/copy.h> +#include <commands/cluster.h> +#include <commands/rename.h> +#include <storage/bufmgr.h> +#include <miscadmin.h> +#include <tcop/dest.h> +#include <commands/command.h> +#include <utils/builtins.h> +#include <utils/excid.h> +#include <utils/mcxt.h> +#include <catalog/pg_proc.h> +#include <catalog/pg_class.h> +#include <optimizer/internal.h> #ifndef NO_SECURITY -#include "utils/acl.h" -#include "utils/syscache.h" +#include <utils/acl.h> #endif /* !NO_SECURITY */ /* diff --git a/src/backend/commands/command.c b/src/backend/commands/command.c index 13c56d888c5389d2014833bc11c57e020d2dd26e..363b5d2a8e16c41d7ee7f55f8e5411dace88267d 100644 --- a/src/backend/commands/command.c +++ b/src/backend/commands/command.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.4 1996/11/03 23:57:21 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.5 1996/11/06 08:21:30 scrappy Exp $ * * NOTES * The PortalExecutorHeapMemory crap needs to be eliminated @@ -20,53 +20,25 @@ * *------------------------------------------------------------------------- */ -#include "postgres.h" +#include <postgres.h> -#include "access/relscan.h" - -#include "nodes/memnodes.h" -#include "nodes/parsenodes.h" -#include "nodes/params.h" -#include "access/sdir.h" -#include "executor/hashjoin.h" -#include "executor/tuptable.h" -#include "access/funcindex.h" -#include "nodes/execnodes.h" -#include "nodes/plannodes.h" -#include "tcop/dest.h" -#include "executor/execdesc.h" -#include "utils/portal.h" - -#include "commands/command.h" - -#include "utils/mcxt.h" - -#include "executor/executor.h" - -#include "executor/execdefs.h" - -#include "catalog/indexing.h" - -#include "utils/syscache.h" - -#include "catalog/catalog.h" - -#include "access/heapam.h" - -#include "utils/array.h" -#include "utils/acl.h" - -#include "optimizer/prep.h" - -#include "catalog/catname.h" - -#include "catalog/pg_proc.h" - -#include "utils/palloc.h" - -#include "catalog/pg_type.h" - -#include "utils/builtins.h" +#include <access/relscan.h> +#include <utils/portal.h> +#include <commands/command.h> +#include <utils/mcxt.h> +#include <executor/executor.h> +#include <executor/execdefs.h> +#include <catalog/indexing.h> +#include <utils/syscache.h> +#include <catalog/catalog.h> +#include <access/heapam.h> +#include <utils/array.h> +#include <utils/acl.h> +#include <optimizer/prep.h> +#include <catalog/catname.h> +#include <catalog/pg_proc.h> +#include <catalog/pg_type.h> +#include <utils/builtins.h> /* ---------------- * PortalExecutorHeapMemory stuff diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c index 1e8aeb0bf6c19c605127733a767618f95a86bd14..0f593d6ec5467d5ba7e23c422ea2149a940290ca 100644 --- a/src/backend/commands/copy.c +++ b/src/backend/commands/copy.c @@ -6,56 +6,32 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.13 1996/11/06 06:47:09 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.14 1996/11/06 08:21:31 scrappy Exp $ * *------------------------------------------------------------------------- */ +#include <string.h> +#include <unistd.h> + #include <postgres.h> #include <access/heapam.h> - -#include <stdio.h> - #include <tcop/dest.h> - #include <fmgr.h> - -#include <utils/palloc.h> - #include <miscadmin.h> - #include <utils/builtins.h> - #include <utils/acl.h> - #include <sys/stat.h> - #include <catalog/pg_index.h> - #include <utils/syscache.h> - -#include <nodes/params.h> -#include <executor/hashjoin.h> -#include <nodes/primnodes.h> -#include <nodes/memnodes.h> -#include <executor/tuptable.h> -#include <nodes/execnodes.h> - #include <utils/memutils.h> - #include <executor/executor.h> - #include <access/transam.h> - #include <catalog/index.h> - #include <access/genam.h> - #include <catalog/pg_type.h> - #include <catalog/catname.h> - #include <catalog/pg_user.h> #define ISOCTAL(c) (((c) >= '0') && ((c) <= '7')) diff --git a/src/backend/commands/creatinh.c b/src/backend/commands/creatinh.c index c8242ba036af1b615e22cf5a7fde93346fb0cdb9..d98d8deceac476cc64fa1567703b4902786ba2db 100644 --- a/src/backend/commands/creatinh.c +++ b/src/backend/commands/creatinh.c @@ -7,36 +7,25 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.3 1996/11/03 23:57:25 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.4 1996/11/06 08:21:32 scrappy Exp $ * *------------------------------------------------------------------------- */ -#include "postgres.h" - -#include "utils/rel.h" -#include "nodes/parsenodes.h" - -#include "catalog/heap.h" - -#include "utils/palloc.h" - -#include "commands/creatinh.h" - -#include "access/xact.h" - -#include "access/heapam.h" - -#include "utils/syscache.h" - -#include "catalog/catname.h" - -#include "catalog/pg_type.h" - -#include "catalog/pg_inherits.h" - #include <stdio.h> -#include "catalog/pg_ipl.h" +#include <postgres.h> + +#include <utils/rel.h> +#include <nodes/parsenodes.h> +#include <catalog/heap.h> +#include <commands/creatinh.h> +#include <access/xact.h> +#include <access/heapam.h> +#include <utils/syscache.h> +#include <catalog/catname.h> +#include <catalog/pg_type.h> +#include <catalog/pg_inherits.h> +#include <catalog/pg_ipl.h> /* ---------------- * local stuff diff --git a/src/backend/commands/defind.c b/src/backend/commands/defind.c index cc5703f8faa66b884f5fc646b21cdacfe6b5c3bd..cd1bbc147475b74165743339854b9aa0ebf78705 100644 --- a/src/backend/commands/defind.c +++ b/src/backend/commands/defind.c @@ -7,37 +7,34 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/Attic/defind.c,v 1.7 1996/11/06 06:47:12 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/Attic/defind.c,v 1.8 1996/11/06 08:21:33 scrappy Exp $ * *------------------------------------------------------------------------- */ #include <string.h> -#include "postgres.h" +#include <postgres.h> -#include "access/attnum.h" -#include "access/genam.h" -#include "access/heapam.h" -#include "utils/builtins.h" -#include "utils/syscache.h" -#include "catalog/index.h" -#include "catalog/pg_index.h" -#include "catalog/pg_proc.h" -#include "catalog/pg_opclass.h" -#include "nodes/plannodes.h" -#include "nodes/primnodes.h" -#include "nodes/relation.h" -#include "utils/palloc.h" -#include "utils/relcache.h" -#include "utils/lsyscache.h" - -#include "commands/defrem.h" -#include "parser/parsetree.h" /* for getrelid() */ - -#include "optimizer/prep.h" -#include "optimizer/clauses.h" -#include "storage/lmgr.h" -#include "fmgr.h" +#include <access/attnum.h> +#include <access/genam.h> +#include <access/heapam.h> +#include <utils/builtins.h> +#include <utils/syscache.h> +#include <catalog/index.h> +#include <catalog/pg_index.h> +#include <catalog/pg_proc.h> +#include <catalog/pg_opclass.h> +#include <nodes/plannodes.h> +#include <nodes/primnodes.h> +#include <nodes/relation.h> +#include <utils/relcache.h> +#include <utils/lsyscache.h> +#include <commands/defrem.h> +#include <parser/parsetree.h> /* for getrelid() */ +#include <optimizer/prep.h> +#include <optimizer/clauses.h> +#include <storage/lmgr.h> +#include <fmgr.h> #define IsFuncIndex(ATTR_LIST) (((IndexElem*)lfirst(ATTR_LIST))->args!=NULL) diff --git a/src/backend/commands/define.c b/src/backend/commands/define.c index f0bf15e0275a6b239682fe59cabcff5f7b74f5b0..89ac127420aa1b634ecc66d11117020eb8f63522 100644 --- a/src/backend/commands/define.c +++ b/src/backend/commands/define.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.5 1996/11/03 23:57:30 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.6 1996/11/06 08:21:34 scrappy Exp $ * * DESCRIPTION * The "DefineFoo" routines take the parse tree and pick out the @@ -32,8 +32,10 @@ * *------------------------------------------------------------------------- */ -#include <string.h> +#include <stdio.h> #include <ctype.h> +#include <string.h> +#include <math.h> #include <postgres.h> @@ -44,17 +46,12 @@ #include <catalog/pg_proc.h> #include <catalog/pg_type.h> #include <utils/syscache.h> -#include <nodes/parsenodes.h> #include <fmgr.h> /* for fmgr */ - #include <utils/builtins.h> /* prototype for textin() */ - -#include <utils/palloc.h> #include <commands/defrem.h> #include <optimizer/xfunc.h> #include <tcop/dest.h> - -#include "catalog/pg_user.h" +#include <catalog/pg_user.h> static char *defGetString(DefElem *def); static int defGetTypeLength(DefElem *def); diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c index d72b40033a6ae3bc643d5e836e5d1aa985e0082e..3a5250c8409c3938305b9a39dbdd0af22c3ada14 100644 --- a/src/backend/commands/explain.c +++ b/src/backend/commands/explain.c @@ -7,23 +7,23 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/explain.c,v 1.3 1996/11/03 23:57:32 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/explain.c,v 1.4 1996/11/06 08:21:35 scrappy Exp $ * *------------------------------------------------------------------------- */ #include <stdio.h> #include <string.h> -#include "postgres.h" -#include "parser/catalog_utils.h" -#include "parser/parse_query.h" /* for MakeTimeRange() */ -#include "nodes/plannodes.h" -#include "tcop/tcopprot.h" -#include "utils/palloc.h" -#include "lib/stringinfo.h" -#include "commands/explain.h" -#include "optimizer/planner.h" -#include "access/xact.h" +#include <postgres.h> + +#include <parser/catalog_utils.h> +#include <parser/parse_query.h> /* for MakeTimeRange() */ +#include <nodes/plannodes.h> +#include <tcop/tcopprot.h> +#include <lib/stringinfo.h> +#include <commands/explain.h> +#include <optimizer/planner.h> +#include <access/xact.h> typedef struct ExplainState { /* options */ diff --git a/src/backend/commands/purge.c b/src/backend/commands/purge.c index 7b29dbc852200198925f2220e14d1394ced08889..df43e601bac8380235d29c274edd416d50457ea8 100644 --- a/src/backend/commands/purge.c +++ b/src/backend/commands/purge.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/Attic/purge.c,v 1.2 1996/11/03 23:57:35 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/Attic/purge.c,v 1.3 1996/11/06 08:21:36 scrappy Exp $ * * Note: * XXX There are many instances of int32 instead of ...Time. These @@ -15,18 +15,16 @@ * *------------------------------------------------------------------------- */ -#include "postgres.h" +#include <postgres.h> -#include "access/heapam.h" -#include "access/xact.h" -#include "utils/tqual.h" /* for NowTimeQual */ -#include "catalog/catname.h" -#include "catalog/indexing.h" -#include "fmgr.h" -#include "utils/palloc.h" - -#include "commands/purge.h" -#include "utils/builtins.h" /* for isreltime() */ +#include <access/heapam.h> +#include <access/xact.h> +#include <utils/tqual.h> /* for NowTimeQual */ +#include <catalog/catname.h> +#include <catalog/indexing.h> +#include <fmgr.h> +#include <commands/purge.h> +#include <utils/builtins.h> /* for isreltime() */ static char cmdname[] = "RelationPurge"; diff --git a/src/backend/commands/recipe.c b/src/backend/commands/recipe.c index 4e679d170934ec2a21e757d7e53e5a46fd45c73a..ed94f0c18ec44c3f98d16c6011843683ff5c90e6 100644 --- a/src/backend/commands/recipe.c +++ b/src/backend/commands/recipe.c @@ -7,29 +7,28 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/Attic/recipe.c,v 1.4 1996/11/03 23:57:36 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/Attic/recipe.c,v 1.5 1996/11/06 08:21:37 scrappy Exp $ * *------------------------------------------------------------------------- */ - - -#include "postgres.h" -#include "nodes/parsenodes.h" -#include "nodes/plannodes.h" -#include "nodes/execnodes.h" -#include "nodes/makefuncs.h" -#include "catalog/pg_type.h" -#include "commands/recipe.h" -#include "libpq/libpq-be.h" -#include "utils/builtins.h" -#include "utils/relcache.h" /* for RelationNameGetRelation*/ -#include "parser/parse_query.h" -#include "rewrite/rewriteHandler.h" -#include "rewrite/rewriteManip.h" -#include "tcop/pquery.h" -#include "tcop/dest.h" -#include "optimizer/planner.h" -#include "executor/executor.h" +#include <postgres.h> + +#include <nodes/parsenodes.h> +#include <nodes/plannodes.h> +#include <nodes/execnodes.h> +#include <nodes/makefuncs.h> +#include <catalog/pg_type.h> +#include <commands/recipe.h> +#include <libpq/libpq-be.h> +#include <utils/builtins.h> +#include <utils/relcache.h> /* for RelationNameGetRelation*/ +#include <parser/parse_query.h> +#include <rewrite/rewriteHandler.h> +#include <rewrite/rewriteManip.h> +#include <tcop/pquery.h> +#include <tcop/dest.h> +#include <optimizer/planner.h> +#include <executor/executor.h> /* from tcop/postgres.c */ extern CommandDest whereToSendOutput; @@ -41,7 +40,7 @@ void beginRecipe(RecipeStmt *stmt) { } #else -#include "tioga/tgRecipe.h" +#include <tioga/tgRecipe.h> #define DEBUG_RECIPE 1 diff --git a/src/backend/commands/remove.c b/src/backend/commands/remove.c index be74f376729b3feb59e351509522490d7f8c7723..2b9dcc2a788ef5612d101592a63d72d1cf0e93b1 100644 --- a/src/backend/commands/remove.c +++ b/src/backend/commands/remove.c @@ -7,30 +7,31 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.5 1996/11/06 06:47:16 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.6 1996/11/06 08:21:38 scrappy Exp $ * *------------------------------------------------------------------------- */ -#include <string.h> +#include <postgres.h> -#include "postgres.h" - -#include "access/heapam.h" -#include "utils/builtins.h" -#include "utils/tqual.h" /* for NowTimeQual */ -#include "utils/syscache.h" -#include "catalog/catname.h" -#include "commands/defrem.h" - -#include "miscadmin.h" - -#include "catalog/pg_aggregate.h" -#include "catalog/pg_language.h" -#include "catalog/pg_operator.h" -#include "catalog/pg_proc.h" -#include "parser/catalog_utils.h" -#include "storage/bufmgr.h" -#include "fmgr.h" +#include <utils/acl.h> +#include <access/heapam.h> +#include <utils/builtins.h> +#include <utils/syscache.h> +#include <catalog/catname.h> +#include <commands/defrem.h> +#include <miscadmin.h> +#include <catalog/pg_aggregate.h> +#include <catalog/pg_language.h> +#include <catalog/pg_operator.h> +#include <catalog/pg_proc.h> +#include <parser/catalog_utils.h> +#include <storage/bufmgr.h> +#include <fmgr.h> +#ifndef HAVE_MEMMOVE +# include <regex/utils.h> +#else +# include <string.h> +#endif /* * RemoveOperator -- diff --git a/src/backend/commands/rename.c b/src/backend/commands/rename.c index 22078181ef0b2fc0e5bc47e87a9a68db2a61663c..c383ac3707fdca6010ccde7297395491e85c6595 100644 --- a/src/backend/commands/rename.c +++ b/src/backend/commands/rename.c @@ -7,49 +7,39 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.2 1996/11/03 23:57:39 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.3 1996/11/06 08:21:39 scrappy Exp $ * *------------------------------------------------------------------------- */ -#include <string.h> - -#include "postgres.h" - -#include "access/heapam.h" -#include "access/relscan.h" -#include "utils/builtins.h" -#include "utils/tqual.h" - -#include "catalog/catname.h" -#include "utils/syscache.h" -#include "catalog/indexing.h" -#include "catalog/catalog.h" - -#include "commands/copy.h" - -#include "executor/execdefs.h" /* for EXEC_{FOR,BACK,FDEBUG,BDEBUG} */ - -#include "storage/itemptr.h" - -#include "miscadmin.h" -#include "utils/portal.h" -#include "tcop/dest.h" -#include "commands/command.h" - -#include "utils/excid.h" -#include "utils/mcxt.h" -#include "utils/palloc.h" - -#include "catalog/pg_attribute.h" -#include "catalog/pg_proc.h" -#include "catalog/pg_class.h" - -#include "optimizer/internal.h" -#include "optimizer/prep.h" /* for find_all_inheritors */ +#include <postgres.h> +#include <access/heapam.h> +#include <access/relscan.h> +#include <utils/builtins.h> +#include <catalog/catname.h> +#include <utils/syscache.h> +#include <catalog/indexing.h> +#include <catalog/catalog.h> +#include <commands/copy.h> +#include <executor/execdefs.h> /* for EXEC_{FOR,BACK,FDEBUG,BDEBUG} */ +#include <miscadmin.h> +#include <utils/portal.h> +#include <tcop/dest.h> +#include <commands/command.h> +#include <utils/excid.h> +#include <utils/mcxt.h> +#include <catalog/pg_proc.h> +#include <catalog/pg_class.h> +#include <optimizer/internal.h> +#include <optimizer/prep.h> /* for find_all_inheritors */ #ifndef NO_SECURITY -#include "utils/acl.h" +# include <utils/acl.h> #endif /* !NO_SECURITY */ +#ifndef HAVE_MEMMOVE +# include <regex/utils.h> +#else +# include <string.h> +#endif /* * renameatt - changes the name of a attribute in a relation diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c index ff9527e17ca94ba1f207f4a5fa4b55941723c951..7fe8648e1ec974fb7f37171e54f973dd9ee39473 100644 --- a/src/backend/commands/vacuum.c +++ b/src/backend/commands/vacuum.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.7 1996/11/06 06:47:18 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.8 1996/11/06 08:21:40 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -18,36 +18,28 @@ #include <fcntl.h> #include <unistd.h> -#include "postgres.h" -#include "utils/portal.h" - -#include "access/genam.h" -#include "access/heapam.h" -#include "access/xact.h" -#include "storage/bufmgr.h" -#include "access/transam.h" -#include "utils/tqual.h" - -#include "catalog/pg_index.h" -#include "catalog/catname.h" -#include "catalog/pg_class.h" -#include "catalog/pg_proc.h" - -#include "storage/smgr.h" -#include "storage/lmgr.h" - -#include "utils/mcxt.h" -#include "utils/palloc.h" - -#include "commands/vacuum.h" - -#include "storage/bufpage.h" - +#include <postgres.h> + +#include <utils/portal.h> +#include <access/genam.h> +#include <access/heapam.h> +#include <access/xact.h> +#include <storage/bufmgr.h> +#include <access/transam.h> +#include <catalog/pg_index.h> +#include <catalog/catname.h> +#include <catalog/pg_class.h> +#include <catalog/pg_proc.h> +#include <storage/smgr.h> +#include <storage/lmgr.h> +#include <utils/mcxt.h> +#include <commands/vacuum.h> +#include <storage/bufpage.h> #ifdef NEED_RUSAGE -#include "rusagestub.h" +# include <rusagestub.h> #else /* NEED_RUSAGE */ -#include <sys/time.h> -#include <sys/resource.h> +# include <sys/time.h> +# include <sys/resource.h> #endif /* NEED_RUSAGE */ bool VacuumRunning = false; diff --git a/src/backend/commands/view.c b/src/backend/commands/view.c index c5f0a7fade18c8ba725933d08912977dadc8a44b..0d0b7de1d0b381b3b4f9ae9260aa07f401c611b5 100644 --- a/src/backend/commands/view.c +++ b/src/backend/commands/view.c @@ -7,25 +7,26 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/view.c,v 1.3 1996/11/03 23:57:43 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/view.c,v 1.4 1996/11/06 08:21:43 scrappy Exp $ * *------------------------------------------------------------------------- */ #include <stdio.h> /* for sprintf() */ -#include "postgres.h" -#include "access/heapam.h" -#include "access/xact.h" -#include "utils/builtins.h" -#include "utils/palloc.h" -#include "nodes/relation.h" -#include "nodes/parsenodes.h" -#include "parser/catalog_utils.h" -#include "parser/parse_query.h" -#include "rewrite/rewriteDefine.h" -#include "rewrite/rewriteHandler.h" -#include "rewrite/rewriteManip.h" -#include "rewrite/rewriteRemove.h" -#include "commands/creatinh.h" + +#include <postgres.h> + +#include <catalog/heap.h> +#include <access/heapam.h> +#include <access/xact.h> +#include <utils/builtins.h> +#include <nodes/relation.h> +#include <parser/catalog_utils.h> +#include <parser/parse_query.h> +#include <rewrite/rewriteDefine.h> +#include <rewrite/rewriteHandler.h> +#include <rewrite/rewriteManip.h> +#include <rewrite/rewriteRemove.h> +#include <commands/creatinh.h> /*--------------------------------------------------------------------- * DefineVirtualRelation