Mercurial > hg > octave-lojdl > gnulib-hg
changeset 14539:148e9e02c46b
* lib/careadlinkat.c (_GL_USE_STDLIB_ALLOC): Define.
(malloc, realloc): Don't #undef; no longer needed.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Fri, 08 Apr 2011 11:11:49 -0700 |
parents | cd02b552d886 |
children | 5ff19a725991 |
files | ChangeLog lib/careadlinkat.c |
diffstat | 2 files changed, 7 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,8 @@ stdlib: let modules use system malloc, realloc * lib/stdlib.in.h (malloc, realloc): Don't #define or add warnings if !_GL_USE_STDLIB_ALLOC. + * lib/careadlinkat.c (_GL_USE_STDLIB_ALLOC): Define. + (malloc, realloc): Don't #undef; no longer needed. careadlinkat: rename members to avoid problem * lib/allocator.h (struct allocator): Rename members from
--- a/lib/careadlinkat.c +++ b/lib/careadlinkat.c @@ -18,6 +18,7 @@ /* Written by Paul Eggert, Bruno Haible, and Jim Meyering. */ +#define _GL_USE_STDLIB_ALLOC 1 #include <config.h> #include "careadlinkat.h" @@ -52,10 +53,10 @@ } #endif -/* Forward declaration. We want to #undef malloc before initializing - this struct, but cannot do so until after all code that uses named - fields from "allocator.h" has been compiled. */ -static struct allocator const standard_allocator; +/* A standard allocator. For now, only careadlinkat needs this, but + perhaps it should be moved to the allocator module. */ +static struct allocator const standard_allocator = + { malloc, realloc, free, NULL }; /* Assuming the current directory is FD, get the symbolic link value of FILENAME as a null-terminated string and put it into a buffer. @@ -168,14 +169,3 @@ errno = ENOMEM; return NULL; } - -/* Use the system functions, not the gnulib overrides, because this - module does not depend on GNU or POSIX semantics. See comments - above why this must occur here. */ -#undef malloc -#undef realloc - -/* A standard allocator. For now, only careadlinkat needs this, but - perhaps it should be moved to the allocator module. */ -static struct allocator const standard_allocator = - { malloc, realloc, free, NULL };