diff options
| author | Bruno Haible <bruno@clisp.org> | 2023-01-22 14:15:21 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2023-01-22 15:57:09 +0100 |
| commit | 98a7c3a0cb97db93cabf376cbef7fbb81d4f4023 (patch) | |
| tree | eed36e649d001cd59e4b4fda48fb5b71ca88f545 /m4 | |
| parent | fbe4d2d5362f8dea731f7162011eafb78ba7c073 (diff) | |
| download | gnulib-98a7c3a0cb97db93cabf376cbef7fbb81d4f4023.tar.gz | |
Resolve conflicts for functions introduced in Android API level 24.
* m4/strchrnul.m4 (gl_FUNC_STRCHRNUL): Conditionally set
REPLACE_STRCHRNUL.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/strchrnul.m4 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/m4/strchrnul.m4 b/m4/strchrnul.m4 index a38e78531e..9b9ab11ada 100644 --- a/m4/strchrnul.m4 +++ b/m4/strchrnul.m4 @@ -1,4 +1,4 @@ -# strchrnul.m4 serial 11 +# strchrnul.m4 serial 12 dnl Copyright (C) 2003, 2007, 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, @@ -13,6 +13,9 @@ AC_DEFUN([gl_FUNC_STRCHRNUL], gl_CHECK_FUNCS_ANDROID([strchrnul], [[#include <string.h>]]) if test $ac_cv_func_strchrnul = no; then HAVE_STRCHRNUL=0 + case "$gl_cv_onwards_func_strchrnul" in + future*) REPLACE_STRCHRNUL=1 ;; + esac else AC_CACHE_CHECK([whether strchrnul works], [gl_cv_func_strchrnul_works], |