Mercurial > hg > octave-kai > gnulib-hg

changeset 14542:62ec88367918

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* lib/setenv.c (_GL_USE_STDLIB_ALLOC, malloc, realloc): Likewise.
author Paul Eggert <eggert@cs.ucla.edu>
date Fri, 08 Apr 2011 11:31:54 -0700
parents 0f5c066f32ab
children 9e26b59ed2ef
files ChangeLog lib/setenv.c
diffstat 2 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
 	(malloc, realloc): Don't #undef; no longer needed.
 	* lib/malloca.c (_GL_USE_STDLIB_ALLOC, malloc): Likewise.
 	* lib/progreloc.c (_GL_USE_STDLIB_ALLOC, malloc): Likewise.
+	* lib/setenv.c (_GL_USE_STDLIB_ALLOC, malloc, realloc): Likewise.
 
 	careadlinkat: rename members to avoid problem
 	* lib/allocator.h (struct allocator): Rename members from
--- a/lib/setenv.c
+++ b/lib/setenv.c
@@ -15,6 +15,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #if !_LIBC
+# define _GL_USE_STDLIB_ALLOC 1
 # include <config.h>
 #endif
 
@@ -64,10 +65,6 @@
 # define clearenv __clearenv
 # define tfind __tfind
 # define tsearch __tsearch
-#else
-/* Use the system functions, not the gnulib overrides in this file.  */
-# undef malloc
-# undef realloc
 #endif
 
 /* In the GNU C library implementation we try to be more clever and