Another run through.
This gets us a clean compile of 'common' and 'gist' with *clean* #include files
This commit is contained in:
parent
1c3a7767ca
commit
d1e9a76131
|
@ -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 <access/sdir.h>
|
||||
#include <access/funcindex.h>
|
||||
#include <access/relscan.h>
|
||||
#include <access/itup.h>
|
||||
|
||||
/* ----------------
|
||||
* generalized index_ interface routines
|
||||
|
|
|
@ -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 <storage/page.h>
|
||||
#include <storage/block.h>
|
||||
#include <utils/rel.h>
|
||||
#include <storage/off.h>
|
||||
|
||||
/*
|
||||
** You can have as many strategies as you please in GiSTs, as
|
||||
|
|
|
@ -11,9 +11,9 @@
|
|||
*/
|
||||
#ifndef GISTSCAN_H
|
||||
|
||||
#include "utils/rel.h"
|
||||
#include "storage/block.h"
|
||||
#include "storage/off.h"
|
||||
#include <storage/off.h>
|
||||
#include <storage/block.h>
|
||||
#include <utils/rel.h>
|
||||
|
||||
void gistadjscans(Relation r, int op, BlockNumber blkno, OffsetNumber offnum);
|
||||
|
||||
|
|
|
@ -12,6 +12,9 @@
|
|||
#ifndef GISTSTRAT_H
|
||||
#define GISTSTRAT_H
|
||||
|
||||
#include <access/strat.h>
|
||||
#include <utils/rel.h>
|
||||
|
||||
StrategyNumber
|
||||
RelationGetGISTStrategy(Relation r, AttrNumber attnum, RegProcedure proc);
|
||||
|
||||
|
|
|
@ -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 --
|
||||
|
|
|
@ -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 <access/skey.h>
|
||||
#include <storage/block.h>
|
||||
#include <storage/off.h>
|
||||
|
||||
/* see rtstrat.c for what all this is about */
|
||||
#define RTNStrategies 8
|
||||
#define RTLeftStrategyNumber 1
|
||||
|
|
|
@ -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 <nodes/execnodes.h>
|
||||
#include <nodes/parsenodes.h>
|
||||
#include <access/itup.h>
|
||||
#include <access/funcindex.h>
|
||||
|
||||
extern Form_pg_am
|
||||
AccessMethodObjectIdGetAccessMethodTupleForm(Oid accessMethodObjectId);
|
||||
|
|
|
@ -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 <tcop/dest.h>
|
||||
#include <nodes/plannodes.h>
|
||||
#include <nodes/parsenodes.h>
|
||||
#include <nodes/nodes.h>
|
||||
|
||||
/* ----------------
|
||||
* query descriptor:
|
||||
|
|
|
@ -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 <catalog/pg_index.h>
|
||||
#include <access/itup.h>
|
||||
#include <stdio.h>
|
||||
#include <executor/execdesc.h>
|
||||
|
||||
/* ----------------------------------------------------------------
|
||||
* #includes
|
||||
* ----------------------------------------------------------------
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#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 <string.h>
|
||||
#endif
|
||||
|
||||
/*
|
||||
* prototypes from functions in execAmi.c
|
||||
|
|
|
@ -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 <nodes/execnodes.h>
|
||||
#include <nodes/nodes.h>
|
||||
|
||||
/* ----------------------------------------------------------------
|
||||
* Executor State types are used in the plannode structures
|
||||
|
|
Loading…
Reference in New Issue