diff options
| -rw-r--r-- | src/include/common/fe_memutils.h | 8 | ||||
| -rw-r--r-- | src/include/utils/palloc.h | 16 |
2 files changed, 14 insertions, 10 deletions
diff --git a/src/include/common/fe_memutils.h b/src/include/common/fe_memutils.h index 82ed8cd9e64..ec650da9e58 100644 --- a/src/include/common/fe_memutils.h +++ b/src/include/common/fe_memutils.h @@ -9,12 +9,18 @@ #ifndef FE_MEMUTILS_H #define FE_MEMUTILS_H +/* "Safe" memory allocation functions --- these exit(1) on failure */ extern char *pg_strdup(const char *in); extern void *pg_malloc(size_t size); extern void *pg_malloc0(size_t size); extern void *pg_realloc(void *pointer, size_t size); extern void pg_free(void *pointer); -#include "utils/palloc.h" +/* Equivalent functions, deliberately named the same as backend functions */ +extern char *pstrdup(const char *in); +extern void *palloc(Size size); +extern void *palloc0(Size size); +extern void *repalloc(void *pointer, Size size); +extern void pfree(void *pointer); #endif /* FE_MEMUTILS_H */ diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h index 420bde7ee4a..f865069d19d 100644 --- a/src/include/utils/palloc.h +++ b/src/include/utils/palloc.h @@ -35,12 +35,10 @@ */ typedef struct MemoryContextData *MemoryContext; -#ifndef FRONTEND - /* * CurrentMemoryContext is the default allocation context for palloc(). - * We declare it here so that palloc() can be a macro. Avoid accessing it - * directly! Instead, use MemoryContextSwitchTo() to change the setting. + * Avoid accessing it directly! Instead, use MemoryContextSwitchTo() + * to change the setting. */ extern PGDLLIMPORT MemoryContext CurrentMemoryContext; @@ -51,6 +49,11 @@ extern void *MemoryContextAlloc(MemoryContext context, Size size); extern void *MemoryContextAllocZero(MemoryContext context, Size size); extern void *MemoryContextAllocZeroAligned(MemoryContext context, Size size); +extern void *palloc(Size size); +extern void *palloc0(Size size); +extern void *repalloc(void *pointer, Size size); +extern void pfree(void *pointer); + /* * The result of palloc() is always word-aligned, so we can skip testing * alignment of the pointer when deciding which MemSet variant to use. @@ -89,13 +92,8 @@ MemoryContextSwitchTo(MemoryContext context) * allocated in a context, not with malloc(). */ extern char *MemoryContextStrdup(MemoryContext context, const char *string); -#endif /* !FRONTEND */ extern char *pstrdup(const char *in); extern char *pnstrdup(const char *in, Size len); -extern void *palloc(Size size); -extern void *palloc0(Size size); -extern void pfree(void *pointer); -extern void *repalloc(void *pointer, Size size); #endif /* PALLOC_H */ |