diff options
| author | Bruno Haible <bruno@clisp.org> | 2023-01-22 14:20:58 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2023-01-22 15:57:13 +0100 |
| commit | 2b7729265f7e38e1087cd9f51099cce5e862147d (patch) | |
| tree | c6aae60baae91875330bdea2c8de37c1b822fde6 /m4 | |
| parent | 31617d81c53135e56f943299f54fd26acc3afe79 (diff) | |
| download | gnulib-2b7729265f7e38e1087cd9f51099cce5e862147d.tar.gz | |
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.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/nl_langinfo.m4 | 5 |
1 files changed, 4 insertions, 1 deletions
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" |