Mercurial > hg > octave-nkf > gnulib-hg
changeset 13607:cb66652c5f88
Make the module 'realloc-gnu' work again on AIX and OSF/1.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Sun, 29 Aug 2010 21:13:46 +0200 |
parents | 81875db181b0 |
children | 476cbe528227 |
files | ChangeLog lib/realloc.c m4/realloc.m4 modules/realloc-gnu |
diffstat | 4 files changed, 20 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2010-08-29 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + Bruno Haible <bruno@clisp.org> + + Make the module 'realloc-gnu' work again on AIX and OSF/1. + * m4/realloc.m4 (gl_FUNC_REALLOC_GNU): Define HAVE_REALLOC_GNU instead + of HAVE_REALLOC. + * lib/realloc.c (NEED_REALLOC_GNU): Enable behaviour also when + GNULIB_REALLOC_GNU && !HAVE_REALLOC_GNU. + (SYSTEM_MALLOC_GLIBC_COMPATIBLE): Adjust definition. + * modules/realloc-gnu (configure.ac): Use gl_MODULE_INDICATOR. + 2010-08-29 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> Bruno Haible <bruno@clisp.org>
--- a/lib/realloc.c +++ b/lib/realloc.c @@ -23,11 +23,14 @@ /* Only the AC_FUNC_REALLOC macro defines 'realloc' already in config.h. */ #ifdef realloc # define NEED_REALLOC_GNU 1 +/* Whereas the gnulib module 'realloc-gnu' defines HAVE_REALLOC_GNU. */ +#elif GNULIB_REALLOC_GNU && !HAVE_REALLOC_GNU +# define NEED_REALLOC_GNU 1 #endif /* Infer the properties of the system's malloc function. - Only the AC_FUNC_MALLOC macro defines 'malloc' already in config.h. */ -#if GNULIB_MALLOC_GNU && !defined malloc + The gnulib module 'malloc-gnu' defines HAVE_MALLOC_GNU. */ +#if GNULIB_MALLOC_GNU && HAVE_MALLOC_GNU # define SYSTEM_MALLOC_GLIBC_COMPATIBLE 1 #endif
--- a/m4/realloc.m4 +++ b/m4/realloc.m4 @@ -1,4 +1,4 @@ -# realloc.m4 serial 10 +# realloc.m4 serial 11 dnl Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -13,10 +13,10 @@ AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) dnl _AC_FUNC_REALLOC_IF is defined in Autoconf. _AC_FUNC_REALLOC_IF( - [AC_DEFINE([HAVE_REALLOC], [1], + [AC_DEFINE([HAVE_REALLOC_GNU], [1], [Define to 1 if your system has a GNU libc compatible 'realloc' function, and to 0 otherwise.])], - [AC_DEFINE([HAVE_REALLOC], [0]) + [AC_DEFINE([HAVE_REALLOC_GNU], [0]) gl_REPLACE_REALLOC ]) ])# gl_FUNC_REALLOC_GNU