From 1c3a7767ca9319298ac996f0eab8970e0893dd4d Mon Sep 17 00:00:00 2001
From: "Marc G. Fournier" <scrappy@hub.org>
Date: Tue, 5 Nov 1996 07:42:46 +0000
Subject: [PATCH] Re-add -I../.. for fmgr.h

Change #include "" to #include <>

Remove a few unused #includes

Make sure it compiles with -Wall -Werror
---
 src/backend/access/common/Makefile     |  5 +++--
 src/backend/access/common/heaptuple.c  | 16 ++++++++--------
 src/backend/access/common/heapvalid.c  | 16 ++++++++--------
 src/backend/access/common/indextuple.c | 15 +++++++--------
 src/backend/access/common/indexvalid.c | 12 ++++++------
 src/backend/access/common/printtup.c   | 14 +++++++-------
 src/backend/access/common/scankey.c    |  8 ++++----
 src/backend/access/common/tupdesc.c    | 18 +++++++++---------
 8 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/src/backend/access/common/Makefile b/src/backend/access/common/Makefile
index fee59a2283e..ed53e982a63 100644
--- a/src/backend/access/common/Makefile
+++ b/src/backend/access/common/Makefile
@@ -4,14 +4,15 @@
 #    Makefile for access/common
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.5 1996/11/03 09:06:42 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.6 1996/11/05 07:42:39 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/common/heaptuple.c b/src/backend/access/common/heaptuple.c
index abc39cc3e71..f33a269736e 100644
--- a/src/backend/access/common/heaptuple.c
+++ b/src/backend/access/common/heaptuple.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.14 1996/11/05 05:26:29 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.15 1996/11/05 07:42:40 scrappy Exp $
  *
  * NOTES
  *    The old interface functions have been converted to macros
@@ -17,16 +17,16 @@
  *-------------------------------------------------------------------------
  */
 
-#include "postgres.h"
+#include <postgres.h>
 
-#include "access/htup.h"
-#include "access/transam.h"
-#include "access/tupmacs.h"
-#include "storage/bufpage.h"
-#include "utils/memutils.h"
+#include <access/htup.h>
+#include <access/transam.h>
+#include <access/tupmacs.h>
+#include <storage/bufpage.h>
+#include <utils/memutils.h>
 
 #ifndef HAVE_MEMMOVE
-# include "regex/utils.h"
+# include <regex/utils.h>
 #else
 # include <string.h>
 #endif
diff --git a/src/backend/access/common/heapvalid.c b/src/backend/access/common/heapvalid.c
index 6164770db6b..f4aceefb340 100644
--- a/src/backend/access/common/heapvalid.c
+++ b/src/backend/access/common/heapvalid.c
@@ -7,19 +7,19 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/Attic/heapvalid.c,v 1.10 1996/11/03 08:16:46 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/Attic/heapvalid.c,v 1.11 1996/11/05 07:42:41 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include "postgres.h"
+#include <postgres.h>
 
-#include "fmgr.h"
-#include "access/heaptuple.h"
-#include "access/xact.h"
-#include "storage/bufpage.h"
-#include "utils/rel.h"
-#include "utils/tqual.h"
+#include <fmgr.h>
+#include <access/heaptuple.h>
+#include <access/xact.h>
+#include <storage/bufpage.h>
+#include <utils/rel.h>
+#include <utils/tqual.h>
 
 /* ----------------
  *	heap_keytest
diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c
index 9ae6d1f5845..882f9639bd5 100644
--- a/src/backend/access/common/indextuple.c
+++ b/src/backend/access/common/indextuple.c
@@ -8,21 +8,20 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.11 1996/11/05 05:26:31 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.12 1996/11/05 07:42:42 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include "postgres.h"
+#include <postgres.h>
 
-#include "access/heapam.h"
-#include "access/ibit.h"
-#include "access/itup.h"
-#include "access/relscan.h"
-#include "access/tupmacs.h"
+#include <access/heapam.h>
+#include <access/ibit.h>
+#include <access/itup.h>
+#include <access/tupmacs.h>
 
 #ifndef HAVE_MEMMOVE
-# include "regex/utils.h"
+# include <regex/utils.h>
 #else
 # include <string.h>
 #endif
diff --git a/src/backend/access/common/indexvalid.c b/src/backend/access/common/indexvalid.c
index bb1970c4fff..5314804d791 100644
--- a/src/backend/access/common/indexvalid.c
+++ b/src/backend/access/common/indexvalid.c
@@ -7,17 +7,17 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.10 1996/11/03 08:16:48 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.11 1996/11/05 07:42:43 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include "postgres.h"
+#include <postgres.h>
 
-#include "access/htup.h"
-#include "access/itup.h"
-#include "access/skey.h"
-#include "executor/execdebug.h"
+#include <access/htup.h>
+#include <access/itup.h>
+#include <access/skey.h>
+#include <executor/execdebug.h>
 
 /* ----------------------------------------------------------------
  *		  index scan key qualification code
diff --git a/src/backend/access/common/printtup.c b/src/backend/access/common/printtup.c
index 97c2ac3f995..edfa7715579 100644
--- a/src/backend/access/common/printtup.c
+++ b/src/backend/access/common/printtup.c
@@ -8,18 +8,18 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.10 1996/11/05 05:26:32 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.11 1996/11/05 07:42:44 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include "postgres.h"
+#include <postgres.h>
 
-#include "fmgr.h" 
-#include "access/heaptuple.h" 
-#include "catalog/pg_type.h"
-#include "libpq/libpq.h"
-#include "utils/syscache.h"
+#include <fmgr.h> 
+#include <access/heaptuple.h> 
+#include <catalog/pg_type.h>
+#include <libpq/libpq.h>
+#include <utils/syscache.h>
 
 /* ----------------------------------------------------------------
  *	printtup / debugtup support
diff --git a/src/backend/access/common/scankey.c b/src/backend/access/common/scankey.c
index a854ee20155..fb242497ebc 100644
--- a/src/backend/access/common/scankey.c
+++ b/src/backend/access/common/scankey.c
@@ -7,15 +7,15 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/scankey.c,v 1.8 1996/11/03 10:57:23 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/scankey.c,v 1.9 1996/11/05 07:42:45 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include "postgres.h"
+#include <postgres.h>
 
-#include "fmgr.h"
-#include "access/skey.h"
+#include <fmgr.h>
+#include <access/skey.h>
 
 /*
  * ScanKeyEntryIsLegal --
diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c
index 504935bd618..0f695027719 100644
--- a/src/backend/access/common/tupdesc.c
+++ b/src/backend/access/common/tupdesc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.10 1996/11/05 05:25:44 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.11 1996/11/05 07:42:46 scrappy Exp $
  *
  * NOTES
  *    some of the executor utility code such as "ExecTypeFromTL" should be
@@ -18,17 +18,17 @@
 
 #include <stdio.h>
 
-#include "postgres.h"
+#include <postgres.h>
 
-#include "parser/catalog_utils.h"
-#include "nodes/parsenodes.h"
-#include "utils/builtins.h"
-#include "utils/fcache.h"
-#include "utils/tqual.h"
-#include "utils/syscache.h"
+#include <parser/catalog_utils.h>
+#include <nodes/parsenodes.h>
+#include <utils/builtins.h>
+#include <utils/fcache.h>
+#include <utils/tqual.h>
+#include <utils/syscache.h>
 
 #ifndef HAVE_MEMMOVE
-# include "regex/utils.h"
+# include <regex/utils.h>
 #else
 # include <string.h>
 #endif
-- 
GitLab