diff options
Diffstat (limited to 'src/include/utils/palloc.h')
| -rw-r--r-- | src/include/utils/palloc.h | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h index 2c969df174c..05fccc81a32 100644 --- a/src/include/utils/palloc.h +++ b/src/include/utils/palloc.h @@ -6,18 +6,34 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: palloc.h,v 1.6 1998/09/01 04:39:24 momjian Exp $ + * $Id: palloc.h,v 1.7 1999/02/06 16:50:34 wieck Exp $ * *------------------------------------------------------------------------- */ #ifndef PALLOC_H #define PALLOC_H -#include <c.h> +#include "c.h" -extern void *palloc(Size size); -extern void pfree(void *pointer); -extern void *repalloc(void *pointer, Size size); +#ifdef PALLOC_IS_MALLOC + +# define palloc(s) malloc(s) +# define pfree(p) free(p) +# define repalloc(p,s) realloc((p),(s)) + +#else /* ! PALLOC_IS_MALLOC */ + +/* ---------- + * In the case we use memory contexts, use macro's for palloc() etc. + * ---------- + */ +# include "utils/mcxt.h" + +# define palloc(s) ((void *)MemoryContextAlloc(CurrentMemoryContext,(Size)(s))) +# define pfree(p) MemoryContextFree(CurrentMemoryContext,(Pointer)(p)) +# define repalloc(p,s) ((void *)MemoryContextRealloc(CurrentMemoryContext,(Pointer)(p),(Size)(s))) + +#endif /* PALLOC_IS_MALLOC */ /* like strdup except uses palloc */ extern char *pstrdup(char *pointer); |