From 4fa90e38d5e35c3a37995afc22a14f28d51327cf Mon Sep 17 00:00:00 2001
From: "Marc G. Fournier" <scrappy@hub.org>
Date: Tue, 5 Nov 1996 10:02:06 +0000
Subject: [PATCH] More cleanups

---
 src/backend/access/index/Makefile  |  5 +++--
 src/backend/access/index/genam.c   | 20 ++++++--------------
 src/backend/access/index/indexam.c | 20 +++++++-------------
 src/backend/access/index/istrat.c  | 35 ++++++++++++-----------------------
 4 files changed, 28 insertions(+), 52 deletions(-)

diff --git a/src/backend/access/index/Makefile b/src/backend/access/index/Makefile
index 23301982d0..13f4b102d8 100644
--- a/src/backend/access/index/Makefile
+++ b/src/backend/access/index/Makefile
@@ -4,14 +4,15 @@
 #    Makefile for access/index
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/access/index/Makefile,v 1.2 1996/10/31 08:32:20 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/access/index/Makefile,v 1.3 1996/11/05 10:02:01 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
 SRCDIR = ../../..
 include ../../../Makefile.global
 
-INCLUDE_OPT = -I../../port/$(PORTNAME) \
+INCLUDE_OPT = -I../.. \
+              -I../../port/$(PORTNAME) \
               -I../../../include
 
 CFLAGS+=$(INCLUDE_OPT)
diff --git a/src/backend/access/index/genam.c b/src/backend/access/index/genam.c
index 935402a383..d1bbbf6301 100644
--- a/src/backend/access/index/genam.c
+++ b/src/backend/access/index/genam.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.5 1996/11/03 12:35:02 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.6 1996/11/05 10:02:02 scrappy Exp $
  *
  * NOTES
  *    many of the old access method routines have been turned into
@@ -44,26 +44,18 @@
  * ----------------------------------------------------------------
  */
 
-#include "postgres.h"
+#include <postgres.h>
 
-#include "access/relscan.h"
-#include "access/itup.h"
-#include "access/sdir.h"
-
-#include "utils/catcache.h"
-
-#include "access/genam.h"
-
-#include "utils/palloc.h"
+#include <utils/catcache.h>
+#include <access/genam.h>
+#include <storage/bufmgr.h>
 
 #ifndef HAVE_MEMMOVE
-# include "regex/utils.h"
+# include <regex/utils.h>
 #else
 # include <string.h>
 #endif
 
-#include "storage/bufmgr.h"
-
 /* ----------------------------------------------------------------
  *	general access method routines
  *
diff --git a/src/backend/access/index/indexam.c b/src/backend/access/index/indexam.c
index 716ad2d778..dc354bdfaa 100644
--- a/src/backend/access/index/indexam.c
+++ b/src/backend/access/index/indexam.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.6 1996/11/03 22:57:36 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.7 1996/11/05 10:02:03 scrappy Exp $
  *
  * INTERFACE ROUTINES
  *	index_open 	- open an index relation by relationId
@@ -63,19 +63,13 @@
  *-------------------------------------------------------------------------
  */
 
-#include "postgres.h"
+#include <postgres.h>
  
-#include "access/genam.h"  
-
-#include "utils/relcache.h"
-
-#include "fmgr.h"
-
-#include "utils/palloc.h"
-
-#include "storage/lmgr.h"
-
-#include "access/heaptuple.h"
+#include <access/genam.h>  
+#include <utils/relcache.h>
+#include <fmgr.h>
+#include <storage/lmgr.h>
+#include <access/heaptuple.h>
 
 /* ----------------
  *   undefine macros we aren't going to use that would otherwise
diff --git a/src/backend/access/index/istrat.c b/src/backend/access/index/istrat.c
index f66795b926..78faab96a5 100644
--- a/src/backend/access/index/istrat.c
+++ b/src/backend/access/index/istrat.c
@@ -8,34 +8,23 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.6 1996/11/03 22:57:40 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.7 1996/11/05 10:02:06 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include "postgres.h"
+#include <postgres.h>
  
-#include "access/relscan.h"
-
-#include "catalog/pg_proc.h"
-
-#include "catalog/pg_operator.h"
-
-#include "catalog/catname.h"
-
-#include "catalog/pg_index.h"
-
-#include "catalog/pg_amop.h"
-
-#include "catalog/pg_amproc.h"
-
-#include "utils/memutils.h" /* could have been access/itup.h */
-
-#include "access/heapam.h"
-
-#include "access/istrat.h"
-
-#include "fmgr.h"
+#include <catalog/pg_proc.h>
+#include <catalog/pg_operator.h>
+#include <catalog/catname.h>
+#include <catalog/pg_index.h>
+#include <catalog/pg_amop.h>
+#include <catalog/pg_amproc.h>
+#include <utils/memutils.h> /* could have been access/itup.h */
+#include <access/heapam.h>
+#include <access/istrat.h>
+#include <fmgr.h>
 
 /* ----------------------------------------------------------------
  *	           misc strategy support routines
-- 
2.11.0