diff options
| author | Daiki Ueno <dueno@redhat.com> | 2018-07-13 17:39:35 +0200 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2018-07-16 09:12:20 +0200 |
| commit | c53888a802eed4baa4aff54060334d2fdbfc7648 (patch) | |
| tree | a2b7b5bf687d2acffe9cf0c8f37396d0015b0fb6 | |
| parent | 53a7e915b2694bc1957d98493a7aee9abfa3c6c5 (diff) | |
build: Make reallocarray detection robuster
On NetBSD, reallocarray is not declared until _OPENBSD_SOURCE is
defined. Reported by Patrick Welche in:
https://lists.freedesktop.org/archives/p11-glue/2018-July/000691.html
| -rw-r--r-- | common/compat.h | 2 | ||||
| -rw-r--r-- | configure.ac | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/common/compat.h b/common/compat.h index d78db0c..1b36673 100644 --- a/common/compat.h +++ b/common/compat.h @@ -258,7 +258,7 @@ char * strndup (const char *data, #endif /* HAVE_STRDUP */ -#ifndef HAVE_REALLOCARRAY +#if defined HAVE_DECL_REALLOCARRAY && !HAVE_DECL_REALLOCARRAY void * reallocarray (void *ptr, size_t nmemb, diff --git a/configure.ac b/configure.ac index a04ae43..c9877d8 100644 --- a/configure.ac +++ b/configure.ac @@ -108,6 +108,7 @@ if test "$os_unix" = "yes"; then AC_CHECK_FUNCS([getauxval getresuid secure_getenv]) AC_CHECK_FUNCS([strnstr memdup strndup strerror_r]) AC_CHECK_FUNCS([reallocarray]) + AC_CHECK_DECLS([reallocarray], [], [], [[#include <stdlib.h>]]) AC_CHECK_FUNCS([fdwalk]) AC_CHECK_FUNCS([setenv]) AC_CHECK_FUNCS([getpeereid]) |