From d1e9a761317271eb0c7a317fad123a18923ebfce Mon Sep 17 00:00:00 2001 From: "Marc G. Fournier" Date: Tue, 5 Nov 1996 08:18:44 +0000 Subject: [PATCH] Another run through. This gets us a clean compile of 'common' and 'gist' with *clean* #include files --- src/include/access/genam.h | 10 +++++----- src/include/access/gist.h | 8 ++++---- src/include/access/gistscan.h | 6 +++--- src/include/access/giststrat.h | 3 +++ src/include/access/istrat.h | 6 +----- src/include/access/rtree.h | 6 +++++- src/include/catalog/index.h | 11 +++++------ src/include/executor/execdesc.h | 3 +-- src/include/executor/executor.h | 22 ++++++---------------- src/include/nodes/plannodes.h | 3 +-- 10 files changed, 34 insertions(+), 44 deletions(-) diff --git a/src/include/access/genam.h b/src/include/access/genam.h index ea81219993..7c7c3e1023 100644 --- a/src/include/access/genam.h +++ b/src/include/access/genam.h @@ -6,17 +6,17 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: genam.h,v 1.3 1996/11/03 12:12:22 scrappy Exp $ + * $Id: genam.h,v 1.4 1996/11/05 08:18:09 scrappy Exp $ * *------------------------------------------------------------------------- */ #ifndef GENAM_H #define GENAM_H -#include "access/itup.h" -#include "access/relscan.h" -#include "access/sdir.h" -#include "access/funcindex.h" +#include +#include +#include +#include /* ---------------- * generalized index_ interface routines diff --git a/src/include/access/gist.h b/src/include/access/gist.h index 38ef591d46..cfafacbc50 100644 --- a/src/include/access/gist.h +++ b/src/include/access/gist.h @@ -12,10 +12,10 @@ #ifndef GIST_H #define GIST_H -#include "storage/off.h" -#include "utils/rel.h" -#include "storage/block.h" -#include "storage/page.h" +#include +#include +#include +#include /* ** You can have as many strategies as you please in GiSTs, as diff --git a/src/include/access/gistscan.h b/src/include/access/gistscan.h index 3eb1eba625..0a4fe7f554 100644 --- a/src/include/access/gistscan.h +++ b/src/include/access/gistscan.h @@ -11,9 +11,9 @@ */ #ifndef GISTSCAN_H -#include "utils/rel.h" -#include "storage/block.h" -#include "storage/off.h" +#include +#include +#include void gistadjscans(Relation r, int op, BlockNumber blkno, OffsetNumber offnum); diff --git a/src/include/access/giststrat.h b/src/include/access/giststrat.h index 82d8c761e0..d189f685b6 100644 --- a/src/include/access/giststrat.h +++ b/src/include/access/giststrat.h @@ -12,6 +12,9 @@ #ifndef GISTSTRAT_H #define GISTSTRAT_H +#include +#include + StrategyNumber RelationGetGISTStrategy(Relation r, AttrNumber attnum, RegProcedure proc); diff --git a/src/include/access/istrat.h b/src/include/access/istrat.h index 0133333c9f..ca1fbc292a 100644 --- a/src/include/access/istrat.h +++ b/src/include/access/istrat.h @@ -6,17 +6,13 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: istrat.h,v 1.2 1996/10/31 09:46:41 scrappy Exp $ + * $Id: istrat.h,v 1.3 1996/11/05 08:18:13 scrappy Exp $ * *------------------------------------------------------------------------- */ #ifndef ISTRAT_H #define ISTRAT_H -#include "access/attnum.h" -#include "access/skey.h" -#include "access/strat.h" -#include "utils/rel.h" /* for Relation */ /* * StrategyNumberIsValid -- diff --git a/src/include/access/rtree.h b/src/include/access/rtree.h index 6835b9004a..a421a79f8a 100644 --- a/src/include/access/rtree.h +++ b/src/include/access/rtree.h @@ -6,13 +6,17 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: rtree.h,v 1.1 1996/08/27 21:50:21 scrappy Exp $ + * $Id: rtree.h,v 1.2 1996/11/05 08:18:14 scrappy Exp $ * *------------------------------------------------------------------------- */ #ifndef RTREE_H #define RTREE_H +#include +#include +#include + /* see rtstrat.c for what all this is about */ #define RTNStrategies 8 #define RTLeftStrategyNumber 1 diff --git a/src/include/catalog/index.h b/src/include/catalog/index.h index 82e7f09e8e..e4497c616d 100644 --- a/src/include/catalog/index.h +++ b/src/include/catalog/index.h @@ -6,18 +6,17 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: index.h,v 1.2 1996/11/03 12:12:28 scrappy Exp $ + * $Id: index.h,v 1.3 1996/11/05 08:18:24 scrappy Exp $ * *------------------------------------------------------------------------- */ #ifndef INDEX_H #define INDEX_H -#include "nodes/execnodes.h" -#include "access/htup.h" -#include "access/itup.h" -#include "nodes/parsenodes.h" -#include "storage/buf.h" +#include +#include +#include +#include extern Form_pg_am AccessMethodObjectIdGetAccessMethodTupleForm(Oid accessMethodObjectId); diff --git a/src/include/executor/execdesc.h b/src/include/executor/execdesc.h index 0244a62e53..2fb13bb909 100644 --- a/src/include/executor/execdesc.h +++ b/src/include/executor/execdesc.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: execdesc.h,v 1.2 1996/11/04 12:11:40 scrappy Exp $ + * $Id: execdesc.h,v 1.3 1996/11/05 08:18:31 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -17,7 +17,6 @@ #include #include #include -#include /* ---------------- * query descriptor: diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h index b91d857f93..1469ff542f 100644 --- a/src/include/executor/executor.h +++ b/src/include/executor/executor.h @@ -6,32 +6,22 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: executor.h,v 1.3 1996/11/03 12:12:39 scrappy Exp $ + * $Id: executor.h,v 1.4 1996/11/05 08:18:34 scrappy Exp $ * *------------------------------------------------------------------------- */ #ifndef EXECUTOR_H #define EXECUTOR_H +#include +#include +#include +#include + /* ---------------------------------------------------------------- - * #includes * ---------------------------------------------------------------- */ -#include - -#include "access/itup.h" -#include "access/relscan.h" -#include "access/skey.h" -#include "access/sdir.h" -#include "catalog/pg_index.h" -#include "executor/execdesc.h" - -#ifndef HAVE_MEMMOVE -# include "regex/utils.h" -#else -# include -#endif /* * prototypes from functions in execAmi.c diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h index bdc77c4803..b02a370fac 100644 --- a/src/include/nodes/plannodes.h +++ b/src/include/nodes/plannodes.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: plannodes.h,v 1.4 1996/11/04 12:11:44 scrappy Exp $ + * $Id: plannodes.h,v 1.5 1996/11/05 08:18:44 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -14,7 +14,6 @@ #define PLANNODES_H #include -#include /* ---------------------------------------------------------------- * Executor State types are used in the plannode structures -- 2.40.0