Modify mcxt.h so that it doesn't pull in half of creation.

tglsfdc · tglsfdc · commit 86c2eadb185b · 1999-03-07T23:03:32.000Z
diff --git a/src/backend/utils/hash/dynahash.c b/src/backend/utils/hash/dynahash.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.20 1999/03/06 21:17:56 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.21 1999/03/07 23:03:32 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -49,6 +49,7 @@
 #include	   "utils/mcxt.h"
 #endif	 /* !FRONTEND */
 #include	   "utils/palloc.h"
+#include	   "utils/memutils.h"
 
 /*
  * Fast arithmetic, relying on powers of 2,
diff --git a/src/include/nodes/memnodes.h b/src/include/nodes/memnodes.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: memnodes.h,v 1.10 1999/02/13 23:21:38 momjian Exp $
+ * $Id: memnodes.h,v 1.11 1999/03/07 23:03:31 tgl Exp $
  *
  * XXX the typedefs in this file are different from the other ???nodes.h;
  *	  they are pointers to structures instead of the structures themselves.
@@ -60,7 +60,9 @@ typedef struct MemoryContextData
 {
 	NodeTag		type;
 	MemoryContextMethods method;
-}		   *MemoryContext;
+}			MemoryContextData;
+
+/* utils/mcxt.h contains typedef struct MemoryContextData *MemoryContext */
 
 /* think about doing this right some time but we'll have explicit fields
    for now -ay 10/94 */
@@ -71,9 +73,11 @@ typedef struct GlobalMemoryData
 	AllocSetData setData;
 	char	   *name;
 	OrderedElemData elemData;
-}		   *GlobalMemory;
+}			GlobalMemoryData;
+
+/* utils/mcxt.h contains typedef struct GlobalMemoryData *GlobalMemory */
 
-typedef MemoryContext *PortalMemoryContext;
+typedef struct MemoryContextData *PortalMemoryContext;
 
 typedef struct PortalVariableMemoryData
 {
diff --git a/src/include/utils/mcxt.h b/src/include/utils/mcxt.h
@@ -6,14 +6,21 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: mcxt.h,v 1.12 1999/02/13 23:22:24 momjian Exp $
+ * $Id: mcxt.h,v 1.13 1999/03/07 23:03:31 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef MCXT_H
 #define MCXT_H
 
-#include <nodes/memnodes.h>
+/* These types are declared in nodes/memnodes.h, but most users of memory
+ * allocation should just treat them as abstract types, so we do not provide
+ * the struct contents here.
+ */
+
+typedef struct MemoryContextData *MemoryContext;
+typedef struct GlobalMemoryData *GlobalMemory;
+
 
 extern MemoryContext CurrentMemoryContext;
 extern MemoryContext TopMemoryContext;

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.20 1999/03/06 21:17:56 tgl Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.21 1999/03/07 23:03:32 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -49,6 +49,7 @@`
`49`	`49`	`#include "utils/mcxt.h"`
`50`	`50`	`#endif /* !FRONTEND */`
`51`	`51`	`#include "utils/palloc.h"`
	`52`	`+#include "utils/memutils.h"`
`52`	`53`
`53`	`54`	`/*`
`54`	`55`	`* Fast arithmetic, relying on powers of 2,`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`* Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $Id: memnodes.h,v 1.10 1999/02/13 23:21:38 momjian Exp $`
	`9`	`+ * $Id: memnodes.h,v 1.11 1999/03/07 23:03:31 tgl Exp $`
`10`	`10`	`*`
`11`	`11`	`* XXX the typedefs in this file are different from the other ???nodes.h;`
`12`	`12`	`* they are pointers to structures instead of the structures themselves.`
`@@ -60,7 +60,9 @@ typedef struct MemoryContextData`
`60`	`60`	`{`
`61`	`61`	`NodeTag type;`
`62`	`62`	`MemoryContextMethods method;`
`63`		`-} *MemoryContext;`
	`63`	`+} MemoryContextData;`
	`64`	`+`
	`65`	`+/* utils/mcxt.h contains typedef struct MemoryContextData MemoryContext /`
`64`	`66`
`65`	`67`	`/* think about doing this right some time but we'll have explicit fields`
`66`	`68`	`for now -ay 10/94 */`
`@@ -71,9 +73,11 @@ typedef struct GlobalMemoryData`
`71`	`73`	`AllocSetData setData;`
`72`	`74`	`char *name;`
`73`	`75`	`OrderedElemData elemData;`
`74`		`-} *GlobalMemory;`
	`76`	`+} GlobalMemoryData;`
	`77`	`+`
	`78`	`+/* utils/mcxt.h contains typedef struct GlobalMemoryData GlobalMemory /`
`75`	`79`
`76`		`-typedef MemoryContext *PortalMemoryContext;`
	`80`	`+typedef struct MemoryContextData *PortalMemoryContext;`
`77`	`81`
`78`	`82`	`typedef struct PortalVariableMemoryData`
`79`	`83`	`{`