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

* m4/nl_langinfo.m4 (gl_FUNC_NL_LANGINFO): Conditionally set
REPLACE_NL_LANGINFO.
* lib/langinfo.in.h (nl_langinfo): Disable _GL_CXXALIASWARN invocation
on non-glibc systems.
---
 ChangeLog         | 5 +++++
 lib/langinfo.in.h | 2 ++
 m4/nl_langinfo.m4 | 5 ++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 39709e91cd..71c23426e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 
 	Resolve conflicts for functions introduced in Android API level 26.
 
+	* m4/nl_langinfo.m4 (gl_FUNC_NL_LANGINFO): Conditionally set
+	REPLACE_NL_LANGINFO.
+	* lib/langinfo.in.h (nl_langinfo): Disable _GL_CXXALIASWARN invocation
+	on non-glibc systems.
+
 	* 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.
diff --git a/lib/langinfo.in.h b/lib/langinfo.in.h
index c7555a6a59..82e1e3cb1b 100644
--- a/lib/langinfo.in.h
+++ b/lib/langinfo.in.h
@@ -208,7 +208,9 @@ _GL_FUNCDECL_SYS (nl_langinfo, char *, (nl_item item));
 #  endif
 _GL_CXXALIAS_SYS (nl_langinfo, char *, (nl_item item));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (nl_langinfo);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef nl_langinfo
 # if HAVE_RAW_DECL_NL_LANGINFO
diff --git a/m4/nl_langinfo.m4 b/m4/nl_langinfo.m4
index c7146ace03..7648d52467 100644
--- a/m4/nl_langinfo.m4
+++ b/m4/nl_langinfo.m4
@@ -1,4 +1,4 @@
-# nl_langinfo.m4 serial 10
+# nl_langinfo.m4 serial 11
 dnl Copyright (C) 2009-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,
@@ -60,6 +60,9 @@ AC_DEFUN([gl_FUNC_NL_LANGINFO],
     fi
   else
     HAVE_NL_LANGINFO=0
+    case "$gl_cv_onwards_func_nl_langinfo" in
+      future*) REPLACE_NL_LANGINFO=1 ;;
+    esac
   fi
   if test $HAVE_NL_LANGINFO = 0 || test $HAVE_LANGINFO_CODESET = 0; then
     LIB_NL_LANGINFO="$SETLOCALE_NULL_LIB"
-- 
2.34.1