Clean up grotty references to CacheCxt (externs inside functions,

duplicate global declarations, no points for style at all!)

src/backend/catalog/heap.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.126 2000/05/19 03:22:31 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.127 2000/05/20 23:11:29 tgl Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -62,6 +62,7 @@
 #include "storage/smgr.h"
 #include "tcop/tcopprot.h"
 #include "utils/builtins.h"
+#include "utils/catcache.h"
 #include "utils/portal.h"
 #include "utils/relcache.h"
 #include "utils/syscache.h"
@@ -184,18 +185,16 @@ heap_create(char *relname,
 			bool istemp,
 			bool storage_create)
 {
+	static unsigned int uniqueId = 0;
+
 	int			i;
 	Oid			relid;
 	Relation	rel;
 	int			len;
 	bool		nailme = false;
 	int			natts = tupDesc->natts;
-	static unsigned int uniqueId = 0;
-
-	extern GlobalMemory CacheCxt;
 	MemoryContext oldcxt;
 
-
 	/* ----------------
 	 *	sanity checks
 	 * ----------------

src/backend/catalog/index.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.109 2000/05/19 03:22:31 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.110 2000/05/20 23:11:28 tgl Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -41,6 +41,7 @@
 #include "parser/parse_func.h"
 #include "storage/smgr.h"
 #include "utils/builtins.h"
+#include "utils/catcache.h"
 #include "utils/relcache.h"
 #include "utils/syscache.h"
 #include "utils/temprel.h"
@@ -432,7 +433,6 @@ AccessMethodObjectIdGetForm(Oid accessMethodObjectId)
 static void
 ConstructIndexReldesc(Relation indexRelation, Oid amoid)
 {
-	extern GlobalMemory CacheCxt;
 	MemoryContext oldcxt;
 
 	/* ----------------
@@ -880,7 +880,6 @@ InitIndexStrategy(int numatts,
 	uint16		amsupport;
 	Oid			attrelid;
 	Size		strsize;
-	extern GlobalMemory CacheCxt;
 
 	/* ----------------
 	 *	get information from the index relation descriptor

src/backend/utils/cache/temprel.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.21 2000/04/12 17:15:54 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.22 2000/05/20 23:11:29 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -28,9 +28,9 @@
 #include "access/xact.h"
 #include "catalog/heap.h"
 #include "catalog/index.h"
+#include "utils/catcache.h"
 #include "utils/temprel.h"
 
-GlobalMemory CacheCxt;
 
 /* ----------------
  *		global variables