From c67a05548870145a113207b124cdc138cd18abc5 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 28 Sep 2020 00:27:43 +0200 Subject: [PATCH] Avoid "warning: The macro `AC_HEADER_STDC' is obsolete". Reported by Gavin Smith in . Based on a patch by Paul Eggert. * m4/malloc.m4 (_AC_FUNC_MALLOC_IF): Don't require AC_HEADER_STDC. Don't test STDC_HEADERS. Assume exists. * m4/realloc.m4 (_AC_FUNC_REALLOC_IF): Likewise. --- ChangeLog | 10 ++++++++++ m4/malloc.m4 | 10 ++-------- m4/realloc.m4 | 10 ++-------- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index df8247620e..d2f9f153ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2020-09-27 Bruno Haible + + Avoid "warning: The macro `AC_HEADER_STDC' is obsolete". + Reported by Gavin Smith in + . + Based on a patch by Paul Eggert. + * m4/malloc.m4 (_AC_FUNC_MALLOC_IF): Don't require AC_HEADER_STDC. Don't + test STDC_HEADERS. Assume exists. + * m4/realloc.m4 (_AC_FUNC_REALLOC_IF): Likewise. + 2020-09-27 Bruno Haible Enable testing of prereleases of Autoconf 2.70. diff --git a/m4/malloc.m4 b/m4/malloc.m4 index c1f8ea32f2..3823566d95 100644 --- a/m4/malloc.m4 +++ b/m4/malloc.m4 @@ -1,4 +1,4 @@ -# malloc.m4 serial 20 +# malloc.m4 serial 21 dnl Copyright (C) 2007, 2009-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -8,18 +8,12 @@ dnl with or without modifications, as long as this notice is preserved. # https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=04be2b7a29d65d9a08e64e8e56e594c91749598c AC_DEFUN([_AC_FUNC_MALLOC_IF], [ - AC_REQUIRE([AC_HEADER_STDC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles - AC_CHECK_HEADERS([stdlib.h]) AC_CACHE_CHECK([for GNU libc compatible malloc], [ac_cv_func_malloc_0_nonnull], [AC_RUN_IFELSE( [AC_LANG_PROGRAM( - [[#if defined STDC_HEADERS || defined HAVE_STDLIB_H - # include - #else - char *malloc (); - #endif + [[#include ]], [[char *p = malloc (0); int result = !p; diff --git a/m4/realloc.m4 b/m4/realloc.m4 index 85b8f874f0..53967f4ef1 100644 --- a/m4/realloc.m4 +++ b/m4/realloc.m4 @@ -1,4 +1,4 @@ -# realloc.m4 serial 18 +# realloc.m4 serial 19 dnl Copyright (C) 2007, 2009-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -8,18 +8,12 @@ dnl with or without modifications, as long as this notice is preserved. # https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=04be2b7a29d65d9a08e64e8e56e594c91749598c AC_DEFUN([_AC_FUNC_REALLOC_IF], [ - AC_REQUIRE([AC_HEADER_STDC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles - AC_CHECK_HEADERS([stdlib.h]) AC_CACHE_CHECK([for GNU libc compatible realloc], [ac_cv_func_realloc_0_nonnull], [AC_RUN_IFELSE( [AC_LANG_PROGRAM( - [[#if defined STDC_HEADERS || defined HAVE_STDLIB_H - # include - #else - char *realloc (); - #endif + [[#include ]], [[char *p = realloc (0, 0); int result = !p; -- 2.39.5