From 871748d48610a530d73781e4e96f7702b131cb90 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 1 Nov 2024 13:44:12 +0100 Subject: [PATCH] eealloc: Revert last change. * m4/eealloc.m4 (gl_EEMALLOC): Invoke _AC_FUNC_MALLOC_IF, not gl_CHECK_MALLOC_POSIX. --- ChangeLog | 6 ++++++ m4/eealloc.m4 | 11 +++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index fd3f4b3fcc..c72f94eea0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2024-11-01 Bruno Haible + + eealloc: Revert last change. + * m4/eealloc.m4 (gl_EEMALLOC): Invoke _AC_FUNC_MALLOC_IF, not + gl_CHECK_MALLOC_POSIX. + 2024-11-01 Bruno Haible realloc-posix: Fix test failure on AIX (regression 2024-10-27). diff --git a/m4/eealloc.m4 b/m4/eealloc.m4 index ee56f81faa..0ad90c687b 100644 --- a/m4/eealloc.m4 +++ b/m4/eealloc.m4 @@ -1,5 +1,5 @@ # eealloc.m4 -# serial 6 +# serial 5 dnl Copyright (C) 2003, 2009-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -14,11 +14,10 @@ AC_DEFUN([gl_EEALLOC], AC_DEFUN([gl_EEMALLOC], [ - gl_CHECK_MALLOC_POSIX - case "$gl_cv_func_malloc_posix" in - *yes) gl_cv_func_malloc_0_nonnull=1 ;; - *) gl_cv_func_malloc_0_nonnull=0 ;; - esac + _AC_FUNC_MALLOC_IF( + [gl_cv_func_malloc_0_nonnull=1], + [gl_cv_func_malloc_0_nonnull=0], + ["$gl_cross_guess_normal"]) AC_DEFINE_UNQUOTED([MALLOC_0_IS_NONNULL], [$gl_cv_func_malloc_0_nonnull], [If malloc(0) is != NULL, define this to 1. Otherwise define this to 0.]) -- 2.39.5