From 6a9be1acc3445f09d7dd875a14271bbb7cb05c0c Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 18 Apr 2021 11:31:02 -0700 Subject: [PATCH 2/2] malloc-gnu, etc.: prefer AS_CASE to woolly AS_IF * m4/calloc.m4 (_AC_FUNC_CALLOC_IF): * m4/malloc.m4 (_AC_FUNC_MALLOC_IF): * m4/realloc.m4 (_AC_FUNC_REALLOC_IF): Use AS_CASE. --- ChangeLog | 5 +++++ m4/calloc.m4 | 3 +-- m4/malloc.m4 | 3 +-- m4/realloc.m4 | 3 +-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index fa630a758..dd491f07b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2021-04-18 Paul Eggert + malloc-gnu, etc.: prefer AS_CASE to woolly AS_IF + * m4/calloc.m4 (_AC_FUNC_CALLOC_IF): + * m4/malloc.m4 (_AC_FUNC_MALLOC_IF): + * m4/realloc.m4 (_AC_FUNC_REALLOC_IF): Use AS_CASE. + malloc-gnu, etc.: sync better with Autoconf * m4/calloc.m4 (_AC_FUNC_CALLOC_IF): * m4/malloc.m4 (_AC_FUNC_MALLOC_IF): diff --git a/m4/calloc.m4 b/m4/calloc.m4 index 776979d25..2f0abee03 100644 --- a/m4/calloc.m4 +++ b/m4/calloc.m4 @@ -47,8 +47,7 @@ AC_DEFUN([_AC_FUNC_CALLOC_IF], esac fi ]) - AS_IF([case $ac_cv_func_calloc_0_nonnull in *yes) :;; *) false;; esac], - [$1], [$2]) + AS_CASE([$ac_cv_func_calloc_0_nonnull], [*yes], [$1], [$2]) ]) diff --git a/m4/malloc.m4 b/m4/malloc.m4 index 9734dab05..c09006df5 100644 --- a/m4/malloc.m4 +++ b/m4/malloc.m4 @@ -33,8 +33,7 @@ AC_DEFUN([_AC_FUNC_MALLOC_IF], esac ]) ]) - AS_IF([case $ac_cv_func_malloc_0_nonnull in *yes) :;; *) false;; esac], - [$1], [$2]) + AS_CASE([$ac_cv_func_malloc_0_nonnull], [*yes], [$1], [$2]) ])# _AC_FUNC_MALLOC_IF # gl_FUNC_MALLOC_GNU diff --git a/m4/realloc.m4 b/m4/realloc.m4 index cde906192..8eb6b199f 100644 --- a/m4/realloc.m4 +++ b/m4/realloc.m4 @@ -33,8 +33,7 @@ AC_DEFUN([_AC_FUNC_REALLOC_IF], esac ]) ]) - AS_IF([case $ac_cv_func_realloc_0_nonnull in *yes) :;; *) false;; esac], - [$1], [$2]) + AS_CASE([$ac_cv_func_realloc_0_nonnull], [*yes], [$1], [$2]) ])# AC_FUNC_REALLOC # gl_FUNC_REALLOC_GNU -- 2.27.0