>From 8148edea8666b821663a7d29e1ea9151d9570106 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sun, 22 Jan 2023 02:22:22 +0100
Subject: [PATCH 12/47] Resolve conflicts for functions introduced in Android
 API level 18.

* m4/getdelim.m4 (gl_FUNC_GETDELIM): Conditionally set REPLACE_GETDELIM.
* m4/getline.m4 (gl_FUNC_GETLINE): Conditionally set REPLACE_GETLINE.
* lib/stdio.in.h (getdelim, getline): Disable _GL_CXXALIASWARN
invocation on non-glibc systems.
---
 ChangeLog      | 9 +++++++++
 lib/stdio.in.h | 4 +++-
 m4/getdelim.m4 | 5 ++++-
 m4/getline.m4  | 5 ++++-
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b60113ead2..39c23bce80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2023-01-22  Bruno Haible  <bruno@clisp.org>
+
+	Resolve conflicts for functions introduced in Android API level 18.
+
+	* m4/getdelim.m4 (gl_FUNC_GETDELIM): Conditionally set REPLACE_GETDELIM.
+	* m4/getline.m4 (gl_FUNC_GETLINE): Conditionally set REPLACE_GETLINE.
+	* lib/stdio.in.h (getdelim, getline): Disable _GL_CXXALIASWARN
+	invocation on non-glibc systems.
+
 2023-01-22  Bruno Haible  <bruno@clisp.org>
 
 	Resolve conflicts for functions introduced in Android API level 16-17.
diff --git a/lib/stdio.in.h b/lib/stdio.in.h
index 8b5ef4bd2d..e3bd60dae1 100644
--- a/lib/stdio.in.h
+++ b/lib/stdio.in.h
@@ -882,7 +882,9 @@ _GL_CXXALIAS_SYS (getdelim, ssize_t,
                    int delimiter,
                    FILE *restrict stream));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (getdelim);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef getdelim
 # if HAVE_RAW_DECL_GETDELIM
@@ -921,7 +923,7 @@ _GL_CXXALIAS_SYS (getline, ssize_t,
                   (char **restrict lineptr, size_t *restrict linesize,
                    FILE *restrict stream));
 # endif
-# if @HAVE_DECL_GETLINE@
+# if __GLIBC__ >= 2 && @HAVE_DECL_GETLINE@
 _GL_CXXALIASWARN (getline);
 # endif
 #elif defined GNULIB_POSIXCHECK
diff --git a/m4/getdelim.m4 b/m4/getdelim.m4
index bbd7c03bcb..d89aae5dff 100644
--- a/m4/getdelim.m4
+++ b/m4/getdelim.m4
@@ -1,4 +1,4 @@
-# getdelim.m4 serial 17
+# getdelim.m4 serial 18
 
 dnl Copyright (C) 2005-2007, 2009-2023 Free Software Foundation, Inc.
 dnl
@@ -96,6 +96,9 @@ AC_DEFUN([gl_FUNC_GETDELIM],
     esac
   else
     HAVE_GETDELIM=0
+    case "$gl_cv_onwards_func_getdelim" in
+      future*) REPLACE_GETDELIM=1 ;;
+    esac
   fi
 
   if test $ac_cv_have_decl_getdelim = no; then
diff --git a/m4/getline.m4 b/m4/getline.m4
index f68fa3a1ac..1f2825c336 100644
--- a/m4/getline.m4
+++ b/m4/getline.m4
@@ -1,4 +1,4 @@
-# getline.m4 serial 31
+# getline.m4 serial 32
 
 dnl Copyright (C) 1998-2003, 2005-2007, 2009-2023 Free Software Foundation,
 dnl Inc.
@@ -84,6 +84,9 @@ AC_DEFUN([gl_FUNC_GETLINE],
       ])
   else
     am_cv_func_working_getline=no
+    case "$gl_cv_onwards_func_getline" in
+      future*) REPLACE_GETLINE=1 ;;
+    esac
   fi
 
   if test $ac_cv_have_decl_getline = no; then
-- 
2.34.1