Resolve conflicts for functions introduced in Android API level 21.
+ * m4/fts.m4 (gl_FUNC_FTS_CORE): Use rpl_* symbols also when the system
+ will have fts_open in a future version.
+ * m4/iswblank.m4 (gl_FUNC_ISWBLANK): Conditionally set REPLACE_ISWBLANK.
+ * m4/mbtowc.m4 (gl_FUNC_MBTOWC): Conditionally set REPLACE_MBTOWC.
+ * m4/vdprintf.m4 (gl_REPLACE_VDPRINTF): Conditionally set
+ REPLACE_VDPRINTF.
+ * m4/wcsnrtombs.m4 (gl_FUNC_WCSNRTOMBS): Conditionally set
+ REPLACE_WCSNRTOMBS.
+
* m4/mbsnrtowcs.m4 (gl_FUNC_MBSNRTOWCS): Conditionally set
REPLACE_MBSNRTOWCS.
* lib/wchar.in.h (mbsnrtowcs): Disable _GL_CXXALIASWARN invocation on
-#serial 23
+#serial 24
dnl Copyright (C) 2005-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,
fi
gl_CHECK_FUNCS_ANDROID([fts_open], [[#include <fts.h>]])
- if test $ac_cv_func_fts_open = yes; then
- dnl The system already has the symbols fts_open, etc.
+ if case "$gl_cv_onwards_func_fts_open" in \
+ yes | future*) true ;; \
+ *) false ;; \
+ esac; then
+ dnl The system already has the symbols fts_open, etc. or will have them
+ dnl in a future version.
dnl Avoid conflicts between these symbols and ours at the linker level.
AC_DEFINE([fts_open], [rpl_fts_open],
[Define to the overridden function name])
-# iswblank.m4 serial 6
+# iswblank.m4 serial 7
dnl Copyright (C) 2011-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,
]])
if test $ac_cv_func_iswblank = no; then
HAVE_ISWBLANK=0
- if test $ac_cv_have_decl_iswblank = yes; then
+ if test $ac_cv_have_decl_iswblank = yes \
+ || case "$gl_cv_onwards_func_iswblank" in \
+ future*) true ;; \
+ *) false ;; \
+ esac; then
REPLACE_ISWBLANK=1
fi
fi
-# mbtowc.m4 serial 4
+# mbtowc.m4 serial 5
dnl Copyright (C) 2011-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,
gl_CHECK_FUNCS_ANDROID([mbtowc], [[#include <stdlib.h>]])
if test $ac_cv_func_mbtowc = no; then
HAVE_MBTOWC=0
+ case "$gl_cv_onwards_func_mbtowc" in
+ future*) REPLACE_MBTOWC=1 ;;
+ esac
else
if false; then
REPLACE_MBTOWC=1
-# vdprintf.m4 serial 2
+# vdprintf.m4 serial 3
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,
[
AC_REQUIRE([gl_STDIO_H_DEFAULTS])
AC_LIBOBJ([vdprintf])
- if test $ac_cv_func_vdprintf = yes; then
+ if test $ac_cv_func_vdprintf = yes \
+ || case "$gl_cv_onwards_func_vdprintf" in \
+ future*) true ;; \
+ *) false ;; \
+ esac; then
REPLACE_VDPRINTF=1
fi
gl_PREREQ_VDPRINTF
-# wcsnrtombs.m4 serial 8
+# wcsnrtombs.m4 serial 9
dnl Copyright (C) 2008-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,
gl_CHECK_FUNCS_ANDROID([wcsnrtombs], [[#include <wchar.h>]])
if test $ac_cv_func_wcsnrtombs = no; then
HAVE_WCSNRTOMBS=0
+ case "$gl_cv_onwards_func_wcsnrtombs" in
+ future*) REPLACE_WCSNRTOMBS=1 ;;
+ esac
else
if test $REPLACE_MBSTATE_T = 1; then
REPLACE_WCSNRTOMBS=1