Carefully merge in Bruce's include file changes ... commit'd only after a

clean compile ...

5 files changed, 18 insertions, 18 deletions

diff --git a/src/include/utils/acl.h b/src/include/utils/acl.h
index 95e68fdf075..e8c2cf0ae29 100644
--- a/src/include/utils/acl.h
+++ b/src/include/utils/acl.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: acl.h,v 1.20 1999/07/09 03:28:53 momjian Exp $
+ * $Id: acl.h,v 1.20.2.1 1999/07/30 17:07:22 scrappy Exp $
  *
  * NOTES
  *	  For backward-compatability purposes we have to allow there
@@ -22,8 +22,9 @@
 #ifndef ACL_H
 #define ACL_H
 
-#include <nodes/parsenodes.h>
-#include <utils/array.h>
+#include "nodes/parsenodes.h"
+#include "utils/array.h"
+#include "utils/memutils.h"
 
 /*
  * AclId		system identifier for the user, group, etc.
diff --git a/src/include/utils/psort.h b/src/include/utils/psort.h
index b9590cef618..98baa6d1f80 100644
--- a/src/include/utils/psort.h
+++ b/src/include/utils/psort.h
@@ -6,17 +6,17 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: psort.h,v 1.19 1999/05/25 16:14:57 momjian Exp $
+ * $Id: psort.h,v 1.19.2.1 1999/07/30 17:07:22 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PSORT_H
 #define PSORT_H
 
-#include "storage/fd.h"
 #include "access/relscan.h"
-#include "utils/lselect.h"
 #include "nodes/plannodes.h"
+#include "storage/fd.h"
+#include "utils/lselect.h"
 
 #define MAXTAPES		7		/* See Knuth Fig. 70, p273 */
 
@@ -66,7 +66,6 @@ typedef struct Psortstate
 } Psortstate;
 
 #ifdef	EBUG
-#include "utils/elog.h"
 #include "storage/buf.h"
 #include "storage/bufmgr.h"
 
diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h
index 4b2ee9de96f..220eab035ce 100644
--- a/src/include/utils/rel.h
+++ b/src/include/utils/rel.h
@@ -6,19 +6,19 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rel.h,v 1.23 1999/05/25 16:14:57 momjian Exp $
+ * $Id: rel.h,v 1.23.2.1 1999/07/30 17:07:22 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef REL_H
 #define REL_H
 
-#include <catalog/pg_am.h>
-#include <catalog/pg_class.h>
-#include <access/strat.h>
-#include <access/tupdesc.h>
-#include <rewrite/prs2lock.h>
-#include <storage/fd.h>
+#include "access/strat.h"
+#include "access/tupdesc.h"
+#include "catalog/pg_am.h"
+#include "catalog/pg_class.h"
+#include "rewrite/prs2lock.h"
+#include "storage/fd.h"
 
 typedef struct Trigger
 {
diff --git a/src/include/utils/rel2.h b/src/include/utils/rel2.h
index 50863611007..9f42ebbcf86 100644
--- a/src/include/utils/rel2.h
+++ b/src/include/utils/rel2.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rel2.h,v 1.8 1999/02/13 23:22:30 momjian Exp $
+ * $Id: rel2.h,v 1.8.2.1 1999/07/30 17:07:22 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef TMP_REL2_H
 #define TMP_REL2_H
 
-#include <utils/rel.h>
+#include "utils/rel.h"
 
 extern IndexStrategy RelationGetIndexStrategy(Relation relation);
 
diff --git a/src/include/utils/relcache.h b/src/include/utils/relcache.h
index d95a9a27fe3..100dcf72d73 100644
--- a/src/include/utils/relcache.h
+++ b/src/include/utils/relcache.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: relcache.h,v 1.12 1999/05/01 19:09:43 tgl Exp $
+ * $Id: relcache.h,v 1.12.2.1 1999/07/30 17:07:23 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef RELCACHE_H
 #define RELCACHE_H
 
-#include <utils/rel.h>
+#include "utils/rel.h"
 
 /*
  * relation lookup routines