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

clean compile ...

18 files changed, 59 insertions, 56 deletions

diff --git a/src/include/storage/multilev.h b/src/include/storage/multilev.h
index 2baccce5bef..733e807c48c 100644
--- a/src/include/storage/multilev.h
+++ b/src/include/storage/multilev.h
@@ -7,14 +7,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: multilev.h,v 1.15 1999/02/13 23:22:07 momjian Exp $
+ * $Id: multilev.h,v 1.15.2.1 1999/07/30 17:07:16 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef MULTILEV_H
 #define MULTILEV_H
 
-#include <storage/lmgr.h>
+#include "storage/lmgr.h"
 
 #ifdef LowLevelLocking
 
diff --git a/src/include/storage/off.h b/src/include/storage/off.h
index 63a3e1b54c3..7d5f5588cb1 100644
--- a/src/include/storage/off.h
+++ b/src/include/storage/off.h
@@ -6,13 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: off.h,v 1.7 1999/05/25 16:14:43 momjian Exp $
+ * $Id: off.h,v 1.7.2.1 1999/07/30 17:07:16 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef OFF_H
 #define OFF_H
 
+#include "storage/itemid.h"
 /*
  * OffsetNumber:
  *
diff --git a/src/include/storage/pos.h b/src/include/storage/pos.h
index 91d85c68c55..20560c9dddd 100644
--- a/src/include/storage/pos.h
+++ b/src/include/storage/pos.h
@@ -6,13 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pos.h,v 1.7 1999/05/25 16:14:44 momjian Exp $
+ * $Id: pos.h,v 1.7.2.1 1999/07/30 17:07:17 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef POS_H
 #define POS_H
 
+#include "storage/off.h"
+
 /*
  * a 'position' used to be <pagenumber, offset> in postgres.  this has
  * been changed to just <offset> as the notion of having multiple pages
diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h
index f62106e1ce2..e9fbaf83b34 100644
--- a/src/include/storage/proc.h
+++ b/src/include/storage/proc.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: proc.h,v 1.24 1999/05/25 22:43:27 momjian Exp $
+ * $Id: proc.h,v 1.24.2.1 1999/07/30 17:07:17 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef _PROC_H_
 #define _PROC_H_
 
-#include <storage/lock.h>
+#include "storage/lock.h"
 
 typedef struct
 {
diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
index 2780152f693..5a5cdc5e0d6 100644
--- a/src/include/storage/s_lock.h
+++ b/src/include/storage/s_lock.h
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.61 1999/06/13 00:07:43 ishii Exp $
+ *	  $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.61.2.1 1999/07/30 17:07:17 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -78,7 +78,7 @@ extern void s_lock_sleep(unsigned spin);
  * All the gcc inlines
  */
 
-#if defined(__alpha)
+#if defined(__alpha__)
 #define TAS(lock) tas(lock)
 #define S_UNLOCK(lock) { __asm__("mb"); *(lock) = 0; }
 
@@ -104,11 +104,11 @@ __asm__("    ldq   $0, %0              \n\
 	return (int) _res;
 }
 
-#endif	 /* __alpha */
+#endif	 /* __alpha__ */
 
 
 
-#if defined(i386)
+#if defined(__i386__)
 #define TAS(lock) tas(lock)
 
 static __inline__ int
@@ -120,7 +120,7 @@ __asm__("lock; xchgb %0,%1": "=q"(_res), "=m"(*lock):"0"(_res));
 	return (int) _res;
 }
 
-#endif	 /* i386 */
+#endif	 /* __i386__ */
 
 
 
@@ -140,7 +140,7 @@ __asm__("swpb %0, %0, [%3]": "=r"(_res), "=m"(*lock):"0"(_res), "r" (lock));
 
 
 
-#if defined(sparc)
+#if defined(__sparc__)
 #define TAS(lock) tas(lock)
 
 static __inline__ int
@@ -154,7 +154,7 @@ tas(volatile slock_t *lock)
 	return (int) _res;
 }
 
-#endif	 /* sparc */
+#endif	 /* __sparc__ */
 
 
 #if defined(__mc68000__) && defined(__linux__)
@@ -226,7 +226,7 @@ tas(volatile slock_t *lock)
  * All non gcc
  */
 
-#if defined(__alpha)
+#if defined(__alpha__)
 /*
  * OSF/1 (Alpha AXP)
  *
@@ -237,7 +237,7 @@ tas(volatile slock_t *lock)
 #define S_UNLOCK(lock)	msem_unlock((lock), 0)
 #define S_INIT_LOCK(lock)	msem_init((lock), MSEM_UNLOCKED)
 #define S_LOCK_FREE(lock)	(!(lock)->msem_state)
-#endif	 /* __alpha */
+#endif	 /* __alpha__ */
 
 
 
@@ -307,7 +307,7 @@ tas(slock_t *s_lock)
  * assembly from his NECEWS SVR4 port, but we probably ought to retain this
  * for the R3000 chips out there.
  */
-#include <mutex.h>
+#include "mutex.h"
 #define TAS(lock)	(test_and_set(lock,1))
 #define S_UNLOCK(lock)	(test_then_and(lock,0))
 #define S_INIT_LOCK(lock)	(test_then_and(lock,0))
diff --git a/src/include/storage/shmem.h b/src/include/storage/shmem.h
index 66365b4a9a7..a6b16cbde25 100644
--- a/src/include/storage/shmem.h
+++ b/src/include/storage/shmem.h
@@ -6,15 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: shmem.h,v 1.18 1999/05/25 22:43:27 momjian Exp $
+ * $Id: shmem.h,v 1.18.2.1 1999/07/30 17:07:17 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef SHMEM_H
 #define SHMEM_H
 
-#include <utils/hsearch.h>
-#include <storage/spin.h>
+#include "storage/spin.h"
+#include "utils/hsearch.h"
 
 
 /* The shared memory region can start at a different address
diff --git a/src/include/storage/sinval.h b/src/include/storage/sinval.h
index 8ef86c8a488..4e86f2cbf09 100644
--- a/src/include/storage/sinval.h
+++ b/src/include/storage/sinval.h
@@ -6,15 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: sinval.h,v 1.11 1999/05/28 17:03:31 tgl Exp $
+ * $Id: sinval.h,v 1.11.2.1 1999/07/30 17:07:17 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef SINVAL_H
 #define SINVAL_H
 
-#include <storage/itemptr.h>
-#include <storage/spin.h>
+#include "storage/itemptr.h"
+#include "storage/spin.h"
 
 extern SPINLOCK SInvalLock;
 
diff --git a/src/include/storage/sinvaladt.h b/src/include/storage/sinvaladt.h
index c939a0c6dbe..d1ebfd42f52 100644
--- a/src/include/storage/sinvaladt.h
+++ b/src/include/storage/sinvaladt.h
@@ -6,15 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: sinvaladt.h,v 1.14 1999/05/28 17:03:30 tgl Exp $
+ * $Id: sinvaladt.h,v 1.14.2.1 1999/07/30 17:07:18 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef SINVALADT_H
 #define SINVALADT_H
 
-#include <storage/itemptr.h>
-#include <storage/ipc.h>
+#include "storage/ipc.h"
+#include "storage/itemptr.h"
 
 /*
  * The structure of the shared cache invaidation segment
diff --git a/src/include/storage/smgr.h b/src/include/storage/smgr.h
index c3c0d314462..5a845974338 100644
--- a/src/include/storage/smgr.h
+++ b/src/include/storage/smgr.h
@@ -6,16 +6,16 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: smgr.h,v 1.14 1999/02/13 23:22:10 momjian Exp $
+ * $Id: smgr.h,v 1.14.2.1 1999/07/30 17:07:18 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef SMGR_H
 #define SMGR_H
 
-#include <storage/spin.h>
-#include <storage/block.h>
-#include <utils/rel.h>
+#include "storage/block.h"
+#include "storage/spin.h"
+#include "utils/rel.h"
 
 #define SM_FAIL			0
 #define SM_SUCCESS		1
diff --git a/src/include/storage/spin.h b/src/include/storage/spin.h
index ace673d98ec..d612fc5f437 100644
--- a/src/include/storage/spin.h
+++ b/src/include/storage/spin.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: spin.h,v 1.8 1999/02/13 23:22:10 momjian Exp $
+ * $Id: spin.h,v 1.8.2.1 1999/07/30 17:07:18 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef SPIN_H
 #define SPIN_H
 
-#include <storage/ipc.h>
+#include "storage/ipc.h"
 
 /*
  * two implementations of spin locks
diff --git a/src/include/tcop/dest.h b/src/include/tcop/dest.h
index f46f9b32484..25947146527 100644
--- a/src/include/tcop/dest.h
+++ b/src/include/tcop/dest.h
@@ -44,15 +44,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: dest.h,v 1.20 1999/05/25 22:43:29 momjian Exp $
+ * $Id: dest.h,v 1.20.2.1 1999/07/30 17:07:20 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef DEST_H
 #define DEST_H
 
-#include <access/htup.h>
-#include <access/tupdesc.h>
+#include "access/htup.h"
+#include "access/tupdesc.h"
 
 /* ----------------
  *		CommandDest is a simplistic means of identifying the desired
diff --git a/src/include/tcop/pquery.h b/src/include/tcop/pquery.h
index 5c783d50142..6465faad0bd 100644
--- a/src/include/tcop/pquery.h
+++ b/src/include/tcop/pquery.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pquery.h,v 1.12 1999/02/13 23:22:13 momjian Exp $
+ * $Id: pquery.h,v 1.12.2.1 1999/07/30 17:07:20 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PQUERY_H
 #define PQUERY_H
 
-#include <executor/execdesc.h>
+#include "executor/execdesc.h"
 
 /* moved to execdesc.h
 extern QueryDesc *CreateQueryDesc(Query *parsetree, Plan *plantree,
diff --git a/src/include/tcop/utility.h b/src/include/tcop/utility.h
index 8baffbeb2c4..66f94c3aed2 100644
--- a/src/include/tcop/utility.h
+++ b/src/include/tcop/utility.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: utility.h,v 1.7 1999/02/13 23:22:13 momjian Exp $
+ * $Id: utility.h,v 1.7.2.1 1999/07/30 17:07:20 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef UTILITY_H
 #define UTILITY_H
 
-#include <executor/execdesc.h>
+#include "executor/execdesc.h"
 
 extern void ProcessUtility(Node *parsetree, CommandDest dest);
 
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