diff options
| author | Bruno Haible <bruno@clisp.org> | 2023-01-22 12:41:14 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2023-01-22 15:56:49 +0100 |
| commit | facb752a0f9b4d609d678791a7a9aecb580ff6e2 (patch) | |
| tree | 976c6f605fa4b3b88f7c4cfc2441c2b81820375b /m4/iswblank.m4 | |
| parent | 639d41bfee3a281ba226188cbc3255f642cf41a0 (diff) | |
| download | gnulib-facb752a0f9b4d609d678791a7a9aecb580ff6e2.tar.gz | |
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.
Diffstat (limited to 'm4/iswblank.m4')
| -rw-r--r-- | m4/iswblank.m4 | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/m4/iswblank.m4 b/m4/iswblank.m4 index f3f96bb784..b1220b1e93 100644 --- a/m4/iswblank.m4 +++ b/m4/iswblank.m4 @@ -1,4 +1,4 @@ -# 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, @@ -17,7 +17,11 @@ AC_DEFUN([gl_FUNC_ISWBLANK], ]]) 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 |