Commit 0cf60fb7 authored by Marc G. Fournier's avatar Marc G. Fournier

More cleaned out #include files

Makefile fixed for fmgr.h
parent d1e9a761
...@@ -4,14 +4,15 @@ ...@@ -4,14 +4,15 @@
# Makefile for access/gist # Makefile for access/gist
# #
# IDENTIFICATION # 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 = ../../.. SRCDIR = ../../..
include ../../../Makefile.global include ../../../Makefile.global
INCLUDE_OPT = -I../../port/$(PORTNAME) \ INCLUDE_OPT = -I../.. \
-I../../port/$(PORTNAME) \
-I../../../include -I../../../include
CFLAGS+=$(INCLUDE_OPT) CFLAGS+=$(INCLUDE_OPT)
......
...@@ -11,23 +11,24 @@ ...@@ -11,23 +11,24 @@
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
#include "postgres.h" #include <postgres.h>
#include "fmgr.h" #include <fmgr.h>
#include "access/genam.h" #include <access/genam.h>
#include "access/gist.h" #include <access/gist.h>
#include "access/gistscan.h" #include <access/gistscan.h>
#include "access/heapam.h" #include <access/heapam.h>
#include "catalog/index.h" #include <catalog/index.h>
#include "executor/executor.h" #include <executor/executor.h>
#include "storage/bufmgr.h" #include <storage/bufmgr.h>
#include "storage/bufpage.h" #include <storage/bufpage.h>
#include "storage/lmgr.h" #include <storage/lmgr.h>
#include "utils/palloc.h" #include <utils/syscache.h>
#include "utils/syscache.h"
#ifndef HAVE_MEMMOVE #ifndef HAVE_MEMMOVE
# include "regex/utils.h" # include <regex/utils.h>
#else
# include <string.h>
#endif #endif
/* non-export function prototypes */ /* non-export function prototypes */
......
...@@ -11,22 +11,18 @@ ...@@ -11,22 +11,18 @@
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
#include <stdio.h> #include <postgres.h>
#include <time.h>
#include "postgres.h" #include <access/relscan.h>
#include <storage/bufpage.h>
#include "access/relscan.h" #include <access/sdir.h>
#include "storage/bufpage.h" #include <access/itup.h>
#include "access/sdir.h" #include <access/gist.h>
#include "access/itup.h" #include <executor/execdebug.h>
#include "access/gist.h" #include <storage/bufmgr.h>
#include "executor/execdebug.h"
#include "utils/palloc.h"
#include "storage/bufmgr.h"
#ifndef HAVE_MEMMOVE #ifndef HAVE_MEMMOVE
# include "regex/utils.h" # include <regex/utils.h>
#else #else
# include <string.h> # include <string.h>
#endif #endif
......
...@@ -10,32 +10,21 @@ ...@@ -10,32 +10,21 @@
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
#include <stdio.h> #include <postgres.h>
#include <time.h>
#include "postgres.h" #include <access/gist.h>
#include <access/genam.h>
#include "access/relscan.h" #include <access/rtree.h>
#include "access/gist.h" #include <storage/bufmgr.h>
#include "access/genam.h" #include <access/giststrat.h>
#include "storage/lmgr.h" #include <storage/lmgr.h>
#ifndef HAVE_MEMMOVE #ifndef HAVE_MEMMOVE
# include "regex/utils.h" # include <regex/utils.h>
#else #else
# include <string.h> # include <string.h>
#endif #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 */ /* routines defined and used here */
static void gistregscan(IndexScanDesc s); static void gistregscan(IndexScanDesc s);
static void gistdropscan(IndexScanDesc s); static void gistdropscan(IndexScanDesc s);
......
...@@ -12,10 +12,10 @@ ...@@ -12,10 +12,10 @@
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
#include "postgres.h" #include <postgres.h>
#include "access/gist.h" #include <access/gist.h>
#include "access/istrat.h" #include <access/istrat.h>
/* /*
* Note: negate, commute, and negatecommute all assume that operators are * Note: negate, commute, and negatecommute all assume that operators are
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment