diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-12-10 12:36:45 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-12-10 12:36:45 +0100 |
| commit | e5b8fad96ed5a0c187d950c8ba1b531a791b25d9 (patch) | |
| tree | 720387fda00142a03178358dc7dc791961867acc | |
| parent | 8cadfed2fe3540c04572fec283bdf09e14113192 (diff) | |
| parent | c992f460c74bee491f831a21326f51c907376ebf (diff) | |
| download | NetworkManager-e5b8fad96ed5a0c187d950c8ba1b531a791b25d9.tar.gz | |
build: merge branch 'maxice8:reallocarray-in-stdlib' into master
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/703
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | meson.build | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index f86cda69ac..8fd65d1371 100644 --- a/configure.ac +++ b/configure.ac @@ -83,6 +83,7 @@ AC_CHECK_DECLS([ reallocarray], [], [], [[ #include <malloc.h> +#include <stdlib.h> ]]) AC_CHECK_DECLS([ diff --git a/meson.build b/meson.build index 13dadd4339..fdd98da91d 100644 --- a/meson.build +++ b/meson.build @@ -126,7 +126,8 @@ config_h.set10('HAVE_RT_SIGQUEUEINFO', cc.has_function('rt_sigqueueinfo', prefix #include <sys/wait.h>''')) config_h.set('HAVE_SECURE_GETENV', cc.has_function('secure_getenv')) config_h.set('HAVE___SECURE_GETENV', cc.has_function('__secure_getenv')) -config_h.set10('HAVE_DECL_REALLOCARRAY', cc.has_function('reallocarray', prefix: '#include <malloc.h>')) +config_h.set10('HAVE_DECL_REALLOCARRAY', cc.has_function('reallocarray', prefix: '''#include <malloc.h> + #include <stdlib.h>''')) config_h.set10('HAVE_DECL_EXPLICIT_BZERO', cc.has_function('explicit_bzero', prefix: '#include <string.h>')) config_h.set10('HAVE_DECL_MEMFD_CREATE', cc.has_function('memfd_create', prefix: '#include <sys/mman.h>')) |