>From 99acf8c353e544dd7894ec5e192cdb1aee52a55c Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sun, 22 Jan 2023 14:44:44 +0100
Subject: [PATCH 44/47] Resolve conflicts for functions introduced in Android
 API level 28.

* m4/aligned_alloc.m4 (gl_FUNC_ALIGNED_ALLOC): Conditionally set
REPLACE_ALIGNED_ALLOC.
* m4/getrandom.m4 (gl_FUNC_GETRANDOM): Conditionally set
REPLACE_GETRANDOM.
---
 ChangeLog           | 5 +++++
 m4/aligned_alloc.m4 | 5 ++++-
 m4/getrandom.m4     | 5 ++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5d89546b44..d06ffacce2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 
 	Resolve conflicts for functions introduced in Android API level 28.
 
+	* m4/aligned_alloc.m4 (gl_FUNC_ALIGNED_ALLOC): Conditionally set
+	REPLACE_ALIGNED_ALLOC.
+	* m4/getrandom.m4 (gl_FUNC_GETRANDOM): Conditionally set
+	REPLACE_GETRANDOM.
+
 	* m4/getlogin_r.m4 (gl_FUNC_GETLOGIN_R): Conditionally set
 	REPLACE_GETLOGIN_R.
 	* lib/unistd.in.h (getlogin_r): Disable _GL_CXXALIASWARN invocation on
diff --git a/m4/aligned_alloc.m4 b/m4/aligned_alloc.m4
index d088701dbc..8b4c10102e 100644
--- a/m4/aligned_alloc.m4
+++ b/m4/aligned_alloc.m4
@@ -1,4 +1,4 @@
-# aligned_alloc.m4 serial 4
+# aligned_alloc.m4 serial 5
 dnl Copyright (C) 2020-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,
@@ -44,5 +44,8 @@ AC_DEFUN([gl_FUNC_ALIGNED_ALLOC],
   else
     dnl The system does not have aligned_alloc.
     HAVE_ALIGNED_ALLOC=0
+    case "$gl_cv_onwards_func_aligned_alloc" in
+      future*) REPLACE_ALIGNED_ALLOC=1 ;;
+    esac
   fi
 ])
diff --git a/m4/getrandom.m4 b/m4/getrandom.m4
index c508f1a55c..7b7f9ce2ee 100644
--- a/m4/getrandom.m4
+++ b/m4/getrandom.m4
@@ -1,4 +1,4 @@
-# getrandom.m4 serial 10
+# getrandom.m4 serial 11
 dnl Copyright 2020-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,
@@ -18,6 +18,9 @@ AC_DEFUN([gl_FUNC_GETRANDOM],
     ]])
   if test "$ac_cv_func_getrandom" != yes; then
     HAVE_GETRANDOM=0
+    case "$gl_cv_onwards_func_getrandom" in
+      future*) REPLACE_GETRANDOM=1 ;;
+    esac
   else
     dnl On Solaris 11.4 the return type is 'int', not 'ssize_t'.
     AC_CACHE_CHECK([whether getrandom is compatible with its GNU+BSD signature],
-- 
2.34.1