summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--m4/reallocarray.m44
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 219d6c16a6..12171e2fff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2023-01-09 Bruno Haible <bruno@clisp.org>
+ reallocarray: Fix compilation error in C++ mode on Android.
+ * m4/reallocarray.m4 (gl_FUNC_REALLOCARRAY): Use gl_CHECK_FUNCS_ANDROID
+ instead of AC_CHECK_FUNCS.
+
+2023-01-09 Bruno Haible <bruno@clisp.org>
+
getsubopt: Fix compilation error in C++ mode on Android.
* m4/getsubopt.m4 (gl_FUNC_GETSUBOPT): Use gl_CHECK_FUNCS_ANDROID
instead of AC_CHECK_FUNCS_ONCE.
diff --git a/m4/reallocarray.m4 b/m4/reallocarray.m4
index 1607b7a9ed..4be7cd1be2 100644
--- a/m4/reallocarray.m4
+++ b/m4/reallocarray.m4
@@ -1,4 +1,4 @@
-# reallocarray.m4 serial 3
+# reallocarray.m4 serial 4
dnl Copyright (C) 2017-2023 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -11,7 +11,7 @@ AC_DEFUN([gl_FUNC_REALLOCARRAY],
AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
AC_REQUIRE([gl_CHECK_MALLOC_PTRDIFF])
- AC_CHECK_FUNCS([reallocarray])
+ gl_CHECK_FUNCS_ANDROID([reallocarray], [[#include <stdlib.h>]])
if test "$ac_cv_func_reallocarray" = no; then
HAVE_REALLOCARRAY=0
elif test "$gl_cv_malloc_ptrdiff" = no; then