From 31617d81c53135e56f943299f54fd26acc3afe79 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sun, 22 Jan 2023 14:16:36 +0100
Subject: Resolve conflicts for functions introduced in Android API level 26.

* lib/stdlib.in.h (getsubopt): Consider REPLACE_GETSUBOPT. Disable
_GL_CXXALIASWARN invocation on non-glibc systems.
* m4/stdlib_h.m4 (gl_STDLIB_H_DEFAULTS): Initialize REPLACE_GETSUBOPT.
* modules/stdlib (Makefile.am): Substitute REPLACE_GETSUBOPT.
* m4/getsubopt.m4 (gl_FUNC_GETSUBOPT): Conditionally set
REPLACE_GETSUBOPT.
* modules/getsubopt (Depends-on, configure.ac): Consider
REPLACE_GETSUBOPT.
---
 modules/getsubopt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'modules/getsubopt')

diff --git a/modules/getsubopt b/modules/getsubopt
index 0b0d23d56d..bdabdd76d5 100644
--- a/modules/getsubopt
+++ b/modules/getsubopt
@@ -8,12 +8,13 @@ m4/getsubopt.m4
 Depends-on:
 stdlib
 extensions
-strchrnul       [test $HAVE_GETSUBOPT = 0]
-memchr          [test $HAVE_GETSUBOPT = 0]
+strchrnul       [test $HAVE_GETSUBOPT = 0 || test $REPLACE_GETSUBOPT = 1]
+memchr          [test $HAVE_GETSUBOPT = 0 || test $REPLACE_GETSUBOPT = 1]
 
 configure.ac:
 gl_FUNC_GETSUBOPT
-gl_CONDITIONAL([GL_COND_OBJ_GETSUBOPT], [test $HAVE_GETSUBOPT = 0])
+gl_CONDITIONAL([GL_COND_OBJ_GETSUBOPT],
+               [test $HAVE_GETSUBOPT = 0 || test $REPLACE_GETSUBOPT = 1])
 AM_COND_IF([GL_COND_OBJ_GETSUBOPT], [
   gl_PREREQ_GETSUBOPT
 ])
-- 
cgit v1.2.1