lib/gnulib
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/gnulib.git synced 2025-08-08 17:22:05 +03:00
Code Activity

Make the module 'realloc-gnu' work again on AIX and OSF/1.

Browse Source
This commit is contained in:
Bruno Haible
2010-08-29 21:13:46 +02:00
parent 9f802acb9d
commit 4ebe9ebcfd
4 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@@ -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> 2010-08-29 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Bruno Haible <bruno@clisp.org> Bruno Haible <bruno@clisp.org>

7
lib/realloc.c
View File

@@ -23,11 +23,14 @@
/* Only the AC_FUNC_REALLOC macro defines 'realloc' already in config.h. */ /* Only the AC_FUNC_REALLOC macro defines 'realloc' already in config.h. */
#ifdef realloc #ifdef realloc
# define NEED_REALLOC_GNU 1 # 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 #endif
/* Infer the properties of the system's malloc function. /* Infer the properties of the system's malloc function.
Only the AC_FUNC_MALLOC macro defines 'malloc' already in config.h. */ The gnulib module 'malloc-gnu' defines HAVE_MALLOC_GNU. */
#if GNULIB_MALLOC_GNU && !defined malloc #if GNULIB_MALLOC_GNU && HAVE_MALLOC_GNU
# define SYSTEM_MALLOC_GLIBC_COMPATIBLE 1 # define SYSTEM_MALLOC_GLIBC_COMPATIBLE 1
#endif #endif

6
m4/realloc.m4
View File

@@ -1,4 +1,4 @@
# realloc.m4 serial 10 # realloc.m4 serial 11
dnl Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc. dnl Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, dnl gives unlimited permission to copy and/or distribute it,
@@ -13,10 +13,10 @@ AC_DEFUN([gl_FUNC_REALLOC_GNU],
AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
dnl _AC_FUNC_REALLOC_IF is defined in Autoconf. dnl _AC_FUNC_REALLOC_IF is defined in Autoconf.
_AC_FUNC_REALLOC_IF( _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' [Define to 1 if your system has a GNU libc compatible 'realloc'
function, and to 0 otherwise.])], function, and to 0 otherwise.])],
[AC_DEFINE([HAVE_REALLOC], [0]) [AC_DEFINE([HAVE_REALLOC_GNU], [0])
gl_REPLACE_REALLOC gl_REPLACE_REALLOC
]) ])
])# gl_FUNC_REALLOC_GNU ])# gl_FUNC_REALLOC_GNU

2
modules/realloc-gnu
View File

@@ -14,7 +14,7 @@ realloc-posix
configure.ac: configure.ac:
gl_FUNC_REALLOC_GNU gl_FUNC_REALLOC_GNU
AC_DEFINE([GNULIB_REALLOC_GNU], 1, [Define to indicate the 'realloc' module.]) gl_MODULE_INDICATOR([realloc-gnu])
Makefile.am: Makefile.am: