Commit86c2ead

committed

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

1 parentdffb88b commit86c2eadCopy full SHA for 86c2ead

File tree

+19

-7

lines changed

+19

-7

lines changed

Lines changed: 2 additions & 1 deletion

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,`

Lines changed: 8 additions & 4 deletions

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`	`NodeTagtype;`
`62`	`62`	`MemoryContextMethodsmethod;`
`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`	`AllocSetDatasetData;`
`72`	`74`	`char*name;`
`73`	`75`	`OrderedElemDataelemData;`
`74`		`-}*GlobalMemory;`
	`76`	`+}GlobalMemoryData;`
	`77`	`+`
	`78`	`+/* utils/mcxt.h contains typedef struct GlobalMemoryData GlobalMemory /`
`75`	`79`
`76`		`-typedefMemoryContext*PortalMemoryContext;`
	`80`	`+typedefstructMemoryContextData*PortalMemoryContext;`
`77`	`81`
`78`	`82`	`typedefstructPortalVariableMemoryData`
`79`	`83`	`{`

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,14 +6,21 @@`
`6`	`6`	`*`
`7`	`7`	`* Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $Id: mcxt.h,v 1.12 1999/02/13 23:22:24 momjian Exp $`
	`9`	`+ * $Id: mcxt.h,v 1.13 1999/03/07 23:03:31 tgl Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`13`	`13`	`#ifndefMCXT_H`
`14`	`14`	`#defineMCXT_H`
`15`	`15`
`16`		`-#include<nodes/memnodes.h>`
	`16`	`+/* These types are declared in nodes/memnodes.h, but most users of memory`
	`17`	`+ * allocation should just treat them as abstract types, so we do not provide`
	`18`	`+ * the struct contents here.`
	`19`	`+ */`
	`20`	`+`
	`21`	`+typedefstructMemoryContextData*MemoryContext;`
	`22`	`+typedefstructGlobalMemoryData*GlobalMemory;`
	`23`	`+`
`17`	`24`
`18`	`25`	`externMemoryContextCurrentMemoryContext;`
`19`	`26`	`externMemoryContextTopMemoryContext;`

Comments

(0)