More cleaned out #include files

Makefile fixed for fmgr.h
REL2_0B
Marc G. Fournier 30 years ago
parent d1e9a76131
commit 0cf60fb718
  1. 5
      src/backend/access/gist/Makefile
  2. 31
      src/backend/access/gist/gist.c
  3. 22
      src/backend/access/gist/gistget.c
  4. 27
      src/backend/access/gist/gistscan.c
  5. 6
      src/backend/access/gist/giststrat.c

@ -4,14 +4,15 @@
# Makefile for access/gist
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/access/gist/Makefile,v 1.2 1996/11/03 09:06:47 scrappy Exp $
# $Header: /cvsroot/pgsql/src/backend/access/gist/Makefile,v 1.3 1996/11/05 08:18:42 scrappy Exp $
#
#-------------------------------------------------------------------------
SRCDIR = ../../..
include ../../../Makefile.global
INCLUDE_OPT = -I../../port/$(PORTNAME) \
INCLUDE_OPT = -I../.. \
-I../../port/$(PORTNAME) \
-I../../../include
CFLAGS+=$(INCLUDE_OPT)

@ -11,23 +11,24 @@
*-------------------------------------------------------------------------
*/
#include "postgres.h"
#include "fmgr.h"
#include "access/genam.h"
#include "access/gist.h"
#include "access/gistscan.h"
#include "access/heapam.h"
#include "catalog/index.h"
#include "executor/executor.h"
#include "storage/bufmgr.h"
#include "storage/bufpage.h"
#include "storage/lmgr.h"
#include "utils/palloc.h"
#include "utils/syscache.h"
#include <postgres.h>
#include <fmgr.h>
#include <access/genam.h>
#include <access/gist.h>
#include <access/gistscan.h>
#include <access/heapam.h>
#include <catalog/index.h>
#include <executor/executor.h>
#include <storage/bufmgr.h>
#include <storage/bufpage.h>
#include <storage/lmgr.h>
#include <utils/syscache.h>
#ifndef HAVE_MEMMOVE
# include "regex/utils.h"
# include <regex/utils.h>
#else
# include <string.h>
#endif
/* non-export function prototypes */

@ -11,22 +11,18 @@
*-------------------------------------------------------------------------
*/
#include <stdio.h>
#include <time.h>
#include <postgres.h>
#include "postgres.h"
#include "access/relscan.h"
#include "storage/bufpage.h"
#include "access/sdir.h"
#include "access/itup.h"
#include "access/gist.h"
#include "executor/execdebug.h"
#include "utils/palloc.h"
#include "storage/bufmgr.h"
#include <access/relscan.h>
#include <storage/bufpage.h>
#include <access/sdir.h>
#include <access/itup.h>
#include <access/gist.h>
#include <executor/execdebug.h>
#include <storage/bufmgr.h>
#ifndef HAVE_MEMMOVE
# include "regex/utils.h"
# include <regex/utils.h>
#else
# include <string.h>
#endif

@ -10,32 +10,21 @@
*-------------------------------------------------------------------------
*/
#include <stdio.h>
#include <time.h>
#include <postgres.h>
#include "postgres.h"
#include "access/relscan.h"
#include "access/gist.h"
#include "access/genam.h"
#include "storage/lmgr.h"
#include <access/gist.h>
#include <access/genam.h>
#include <access/rtree.h>
#include <storage/bufmgr.h>
#include <access/giststrat.h>
#include <storage/lmgr.h>
#ifndef HAVE_MEMMOVE
# include "regex/utils.h"
# include <regex/utils.h>
#else
# include <string.h>
#endif
#include "utils/palloc.h"
#include "storage/block.h"
#include "storage/off.h"
#include "access/rtree.h"
#include "storage/bufmgr.h"
#include "access/giststrat.h"
/* routines defined and used here */
static void gistregscan(IndexScanDesc s);
static void gistdropscan(IndexScanDesc s);

@ -12,10 +12,10 @@
*-------------------------------------------------------------------------
*/
#include "postgres.h"
#include <postgres.h>
#include "access/gist.h"
#include "access/istrat.h"
#include <access/gist.h>
#include <access/istrat.h>
/*
* Note: negate, commute, and negatecommute all assume that operators are

Loading…
Cancel
Save