Another first pass at cleaning up the #includes

This commit is contained in:
Marc G. Fournier 1996-11-03 23:57:43 +00:00
parent d46d53387f
commit 510ebf75a1
16 changed files with 30 additions and 185 deletions

View File

@ -4,7 +4,7 @@
# Makefile for commands
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.1 1996/10/27 09:47:14 bryanh Exp $
# $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.2 1996/11/03 23:57:17 scrappy Exp $
#
#-------------------------------------------------------------------------
@ -13,7 +13,6 @@ include ../../Makefile.global
INCLUDE_OPT = -I.. \
-I../port/$(PORTNAME) \
-I../include \
-I../../include
CFLAGS+=$(INCLUDE_OPT)

View File

@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/version.c,v 1.1.1.1 1996/07/09 06:21:23 scrappy Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/version.c,v 1.2 1996/11/03 23:57:42 scrappy Exp $
*
* NOTES
* At the point the version is defined, 2 physical relations are created
@ -22,14 +22,12 @@
*-------------------------------------------------------------------------
*/
#include <stdio.h>
#include <string.h>
#include "postgres.h"
#include "utils/rel.h"
#include "access/heapam.h"
#include "utils/builtins.h"
#include "utils/elog.h"
#include "nodes/pg_list.h"
#include "commands/version.h"
#include "access/xact.h" /* for GetCurrentXactStartTime */
#include "tcop/tcopprot.h"

View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.4 1996/10/21 09:37:20 scrappy Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.5 1996/11/03 23:57:19 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@ -61,34 +61,10 @@
#include "postgres.h"
#include "catalog/pg_attribute.h"
#include "access/attnum.h"
#include "nodes/pg_list.h"
#include "access/tupdesc.h"
#include "storage/fd.h"
#include "catalog/pg_am.h"
#include "catalog/pg_class.h"
#include "nodes/nodes.h"
#include "rewrite/prs2lock.h"
#include "access/skey.h"
#include "access/strat.h"
#include "utils/rel.h"
#include "storage/block.h"
#include "storage/off.h"
#include "storage/itemptr.h"
#include <time.h>
#include "utils/nabstime.h"
#include "access/htup.h"
#include "utils/tqual.h"
#include "storage/buf.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"
@ -98,8 +74,6 @@
#include "access/heapam.h"
#include <stdio.h>
#include "storage/ipc.h"
#include "storage/bufmgr.h"
#include "nodes/memnodes.h"
@ -112,10 +86,8 @@
#include <errno.h>
#include <netinet/in.h>
#include "libpq/pqcomm.h"
#include "libpq/libpq.h"
#include "utils/syscache.h"
static int notifyFrontEndPending = 0;
static int notifyIssued = 0;

View File

@ -14,7 +14,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.6 1996/09/26 16:29:05 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.7 1996/11/03 23:57:20 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@ -23,17 +23,11 @@
#include "postgres.h"
#include "nodes/pg_list.h"
#include "access/attnum.h"
#include "access/heapam.h"
#include "access/genam.h"
#include "access/htup.h"
#include "access/itup.h"
#include "access/relscan.h"
#include "access/skey.h"
#include "access/xact.h"
#include "utils/tqual.h"
#include "catalog/catname.h"
#include "utils/syscache.h"
@ -45,9 +39,7 @@
#include "commands/cluster.h"
#include "commands/rename.h"
#include "storage/buf.h"
#include "storage/bufmgr.h"
#include "storage/itemptr.h"
#include "miscadmin.h"
#include "tcop/dest.h"
@ -55,12 +47,9 @@
#include "utils/builtins.h"
#include "utils/excid.h"
#include "utils/elog.h"
#include "utils/mcxt.h"
#include "utils/palloc.h"
#include "utils/rel.h"
#include "catalog/pg_attribute.h"
#include "catalog/pg_proc.h"
#include "catalog/pg_class.h"

View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.3 1996/10/21 09:37:23 scrappy Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.4 1996/11/03 23:57:21 scrappy Exp $
*
* NOTES
* The PortalExecutorHeapMemory crap needs to be eliminated
@ -22,32 +22,9 @@
*/
#include "postgres.h"
#include "catalog/pg_attribute.h"
#include "access/attnum.h"
#include "nodes/pg_list.h"
#include "access/tupdesc.h"
#include "storage/fd.h"
#include "catalog/pg_am.h"
#include "catalog/pg_class.h"
#include "nodes/nodes.h"
#include "rewrite/prs2lock.h"
#include "access/skey.h"
#include "access/strat.h"
#include "utils/rel.h"
#include "storage/block.h"
#include "storage/off.h"
#include "storage/itemptr.h"
#include <time.h>
#include "utils/nabstime.h"
#include "access/htup.h"
#include "utils/tqual.h"
#include "storage/buf.h"
#include "access/relscan.h"
#include "nodes/memnodes.h"
#include "nodes/primnodes.h"
#include "nodes/parsenodes.h"
#include "nodes/params.h"
#include "access/sdir.h"
@ -64,9 +41,6 @@
#include "utils/mcxt.h"
#include <stdio.h>
#include "catalog/pg_index.h"
#include "access/itup.h"
#include "executor/executor.h"
#include "executor/execdefs.h"
@ -92,7 +66,6 @@
#include "catalog/pg_type.h"
#include "utils/geo-decls.h"
#include "utils/builtins.h"
/* ----------------

View File

@ -6,40 +6,15 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.11 1996/11/02 02:01:47 bryanh Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.12 1996/11/03 23:57:22 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
#include <postgres.h>
#include <catalog/pg_attribute.h>
#include <access/attnum.h>
#include <nodes/pg_list.h>
#include <access/tupdesc.h>
#include <storage/fd.h>
#include <catalog/pg_am.h>
#include <catalog/pg_class.h>
#include <nodes/nodes.h>
#include <rewrite/prs2lock.h>
#include <access/skey.h>
#include <access/strat.h>
#include <utils/rel.h>
#include <storage/block.h>
#include <storage/off.h>
#include <storage/itemptr.h>
#include <time.h>
#include <utils/nabstime.h>
#include <access/htup.h>
#include <utils/tqual.h>
#include <storage/buf.h>
#include <access/relscan.h>
#include <access/heapam.h>
#include <access/itup.h>
#include <stdio.h>
#include <tcop/dest.h>
@ -50,19 +25,15 @@
#include <miscadmin.h>
#include <utils/geo-decls.h>
#include <utils/builtins.h>
#include <sys/stat.h>
#include <access/funcindex.h>
#include <catalog/pg_index.h>
#include <utils/syscache.h>
#include <nodes/params.h>
#include <access/sdir.h>
#include <executor/hashjoin.h>
#include <nodes/primnodes.h>
#include <nodes/memnodes.h>
@ -71,13 +42,8 @@
#include <utils/memutils.h>
#include <nodes/plannodes.h>
#include <nodes/parsenodes.h>
#include <executor/execdesc.h>
#include <executor/executor.h>
#include <storage/ipc.h>
#include <storage/bufmgr.h>
#include <access/transam.h>
#include <catalog/index.h>
@ -88,6 +54,7 @@
#include <catalog/catname.h>
#include <catalog/pg_user.h>
#define ISOCTAL(c) (((c) >= '0') && ((c) <= '7'))
#define VALUE(c) ((c) - '0')

View File

@ -7,33 +7,13 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.2 1996/10/21 09:37:21 scrappy Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.3 1996/11/03 23:57:25 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
#include "postgres.h"
#include "catalog/pg_attribute.h"
#include "access/attnum.h"
#include "nodes/pg_list.h"
#include "access/tupdesc.h"
#include "storage/fd.h"
#include "catalog/pg_am.h"
#include "catalog/pg_class.h"
#include "nodes/nodes.h"
#include "rewrite/prs2lock.h"
#include "access/skey.h"
#include "access/strat.h"
#include "utils/rel.h"
#include "nodes/primnodes.h"
#include <time.h>
#include "utils/nabstime.h"
#include "storage/block.h"
#include "storage/off.h"
#include "storage/itemptr.h"
#include "access/htup.h"
#include "utils/tqual.h"
#include "nodes/parsenodes.h"
#include "catalog/heap.h"
@ -44,10 +24,6 @@
#include "access/xact.h"
#include "access/htup.h"
#include "utils/tqual.h"
#include "storage/buf.h"
#include "access/relscan.h"
#include "access/heapam.h"
#include "utils/syscache.h"

View File

@ -7,28 +7,26 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/defind.c,v 1.5 1996/10/23 07:39:57 scrappy Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/defind.c,v 1.6 1996/11/03 23:57:27 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
#include <string.h>
#include "postgres.h"
#include "access/attnum.h"
#include "access/genam.h"
#include "access/heapam.h"
#include "access/htup.h"
#include "access/funcindex.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/pg_list.h"
#include "nodes/plannodes.h"
#include "nodes/primnodes.h"
#include "nodes/relation.h"
#include "utils/elog.h"
#include "utils/palloc.h"
#include "utils/relcache.h"
#include "utils/lsyscache.h"

View File

@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.4 1996/11/02 02:01:48 bryanh Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.5 1996/11/03 23:57:30 scrappy Exp $
*
* DESCRIPTION
* The "DefineFoo" routines take the parse tree and pick out the
@ -38,25 +38,24 @@
#include <postgres.h>
#include <access/heapam.h>
#include <utils/tqual.h>
#include <catalog/catname.h>
#include <catalog/pg_aggregate.h>
#include <catalog/pg_operator.h>
#include <catalog/pg_proc.h>
#include <catalog/pg_type.h>
#include <utils/syscache.h>
#include <nodes/pg_list.h>
#include <nodes/parsenodes.h>
#include <fmgr.h> /* for fmgr */
#include <utils/builtins.h> /* prototype for textin() */
#include <utils/elog.h>
#include <utils/palloc.h>
#include <commands/defrem.h>
#include <optimizer/xfunc.h>
#include <tcop/dest.h>
#include "catalog/pg_user.h"
static char *defGetString(DefElem *def);
static int defGetTypeLength(DefElem *def);

View File

@ -7,18 +7,18 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/explain.c,v 1.2 1996/10/23 07:40:08 scrappy Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/explain.c,v 1.3 1996/11/03 23:57:32 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/elog.h"
#include "utils/palloc.h"
#include "lib/stringinfo.h"
#include "commands/explain.h"

View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/purge.c,v 1.1.1.1 1996/07/09 06:21:21 scrappy Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/purge.c,v 1.2 1996/11/03 23:57:35 scrappy Exp $
*
* Note:
* XXX There are many instances of int32 instead of ...Time. These
@ -15,7 +15,7 @@
*
*-------------------------------------------------------------------------
*/
#include "c.h"
#include "postgres.h"
#include "access/heapam.h"
#include "access/xact.h"
@ -23,11 +23,8 @@
#include "catalog/catname.h"
#include "catalog/indexing.h"
#include "fmgr.h"
#include "utils/elog.h"
#include "utils/palloc.h"
#include "utils/nabstime.h"
#include "catalog/pg_class.h"
#include "commands/purge.h"
#include "utils/builtins.h" /* for isreltime() */

View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/recipe.c,v 1.3 1996/10/30 02:01:45 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/recipe.c,v 1.4 1996/11/03 23:57:36 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@ -17,14 +17,11 @@
#include "nodes/parsenodes.h"
#include "nodes/plannodes.h"
#include "nodes/execnodes.h"
#include "nodes/pg_list.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/elog.h"
#include "utils/geo-decls.h"
#include "utils/relcache.h" /* for RelationNameGetRelation*/
#include "parser/parse_query.h"
#include "rewrite/rewriteHandler.h"

View File

@ -7,31 +7,25 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.3 1996/10/23 07:40:09 scrappy Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.4 1996/11/03 23:57:38 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
#include <string.h>
#include "c.h"
#include "access/attnum.h"
#include "postgres.h"
#include "access/heapam.h"
#include "access/htup.h"
#include "access/skey.h"
#include "utils/builtins.h"
#include "utils/tqual.h" /* for NowTimeQual */
#include "catalog/catname.h"
#include "commands/defrem.h"
#include "utils/elog.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 "catalog/pg_type.h"
#include "utils/syscache.h"
#include "parser/catalog_utils.h"
#include "storage/bufmgr.h"
#include "fmgr.h"

View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.1.1.1 1996/07/09 06:21:22 scrappy Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.2 1996/11/03 23:57:39 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@ -15,12 +15,8 @@
#include "postgres.h"
#include "nodes/pg_list.h"
#include "access/attnum.h"
#include "access/heapam.h"
#include "access/htup.h"
#include "access/relscan.h"
#include "access/skey.h"
#include "utils/builtins.h"
#include "utils/tqual.h"
@ -33,7 +29,6 @@
#include "executor/execdefs.h" /* for EXEC_{FOR,BACK,FDEBUG,BDEBUG} */
#include "storage/buf.h"
#include "storage/itemptr.h"
#include "miscadmin.h"
@ -42,10 +37,8 @@
#include "commands/command.h"
#include "utils/excid.h"
#include "utils/elog.h"
#include "utils/mcxt.h"
#include "utils/palloc.h"
#include "utils/rel.h"
#include "catalog/pg_attribute.h"
#include "catalog/pg_proc.h"
@ -56,7 +49,6 @@
#ifndef NO_SECURITY
#include "utils/acl.h"
#include "utils/syscache.h"
#endif /* !NO_SECURITY */
/*

View File

@ -7,11 +7,12 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.5 1996/10/23 07:40:10 scrappy Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.6 1996/11/03 23:57:40 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
#include <sys/file.h>
#include <string.h>
#include "postgres.h"
#include "utils/portal.h"
@ -22,26 +23,22 @@
#include "storage/bufmgr.h"
#include "access/transam.h"
#include "utils/tqual.h"
#include "access/htup.h"
#include "catalog/pg_index.h"
#include "catalog/catname.h"
#include "catalog/pg_class.h"
#include "catalog/pg_proc.h"
#include "storage/fd.h" /* for O_ */
#include "storage/itemid.h"
#include "storage/bufmgr.h"
#include "storage/bufpage.h"
#include "storage/smgr.h"
#include "storage/lmgr.h"
#include "utils/elog.h"
#include "utils/mcxt.h"
#include "utils/palloc.h"
#include "commands/vacuum.h"
#include "storage/bufpage.h"
#ifdef NEED_RUSAGE
#include "rusagestub.h"
#else /* NEED_RUSAGE */

View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/view.c,v 1.2 1996/10/30 02:01:47 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/commands/view.c,v 1.3 1996/11/03 23:57:43 scrappy Exp $
*
*-------------------------------------------------------------------------
*/
@ -16,11 +16,8 @@
#include "access/heapam.h"
#include "access/xact.h"
#include "utils/builtins.h"
#include "utils/syscache.h"
#include "utils/elog.h"
#include "utils/palloc.h"
#include "nodes/relation.h"
#include "nodes/primnodes.h"
#include "nodes/parsenodes.h"
#include "parser/catalog_utils.h"
#include "parser/parse_query.h"