From 98a7c3a0cb97db93cabf376cbef7fbb81d4f4023 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 22 Jan 2023 14:15:21 +0100 Subject: [PATCH 36/47] Resolve conflicts for functions introduced in Android API level 24. * m4/strchrnul.m4 (gl_FUNC_STRCHRNUL): Conditionally set REPLACE_STRCHRNUL. --- ChangeLog | 6 ++++++ m4/strchrnul.m4 | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0239e388cd..905fd782d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2023-01-22 Bruno Haible + + Resolve conflicts for functions introduced in Android API level 24. + * m4/strchrnul.m4 (gl_FUNC_STRCHRNUL): Conditionally set + REPLACE_STRCHRNUL. + 2023-01-22 Bruno Haible Resolve conflicts for functions introduced in Android API level 23. 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 ]]) 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], -- 2.34.1