diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2025-10-18 19:06:52 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2025-10-18 19:06:52 +0200 |
| commit | 27dae84ed92f1ef0300263091972338d12e78348 (patch) | |
| tree | 7c52931f474fafb8a4bd4fd15ca3461c77cdecc2 /gnulib-m4/reallocarray.m4 | |
| parent | 4682deeb62247d34de87f8e777f99e2d337fd377 (diff) | |
New upstream version 1.4.1upstream/1.4.1upstream
Diffstat (limited to 'gnulib-m4/reallocarray.m4')
| -rw-r--r-- | gnulib-m4/reallocarray.m4 | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/gnulib-m4/reallocarray.m4 b/gnulib-m4/reallocarray.m4 index 958095e1..3970d9e1 100644 --- a/gnulib-m4/reallocarray.m4 +++ b/gnulib-m4/reallocarray.m4 @@ -1,9 +1,10 @@ # reallocarray.m4 -# serial 5 -dnl Copyright (C) 2017-2024 Free Software Foundation, Inc. +# serial 7 +dnl Copyright (C) 2017-2025 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. +dnl This file is offered as-is, without any warranty. AC_DEFUN([gl_FUNC_REALLOCARRAY], [ @@ -12,14 +13,21 @@ AC_DEFUN([gl_FUNC_REALLOCARRAY], AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) AC_REQUIRE([gl_CHECK_MALLOC_PTRDIFF]) + AC_REQUIRE([gl_FUNC_REALLOC_0_NONNULL]) gl_CHECK_FUNCS_ANDROID([reallocarray], [[#include <stdlib.h>]]) if test "$ac_cv_func_reallocarray" = no; then HAVE_REALLOCARRAY=0 case "$gl_cv_onwards_func_reallocarray" in future*) REPLACE_REALLOCARRAY=1 ;; esac - elif test "$gl_cv_malloc_ptrdiff" = no; then - REPLACE_REALLOCARRAY=1 + else + if test "$gl_cv_malloc_ptrdiff" = no; then + REPLACE_REALLOCARRAY=1 + fi + case "$gl_cv_func_realloc_0_nonnull" in + *yes) ;; + *) REPLACE_REALLOCARRAY=1 ;; + esac fi ]) |