From: Bruno Haible Date: Wed, 4 Sep 2024 08:34:04 +0000 (+0200) Subject: Resolve conflicts for functions introduced in Android API level 35. X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=2d4c7ab0df919665f787a15610b2b4daea5f1e19;p=gnulib.git Resolve conflicts for functions introduced in Android API level 35. * m4/strerrorname_np.m4 (gl_FUNC_COPY_FILE_RANGE): Conditionally set REPLACE_STRERRORNAME_NP. (gl_CHECK_STRERRORNAME_NP): Test for strerrorname_np using gl_CHECK_FUNCS_ANDROID instead of AC_CHECK_FUNCS. --- diff --git a/ChangeLog b/ChangeLog index c4c34d2782..027ae99cfe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2024-09-04 Bruno Haible + + Resolve conflicts for functions introduced in Android API level 35. + + * m4/strerrorname_np.m4 (gl_FUNC_COPY_FILE_RANGE): Conditionally set + REPLACE_STRERRORNAME_NP. + (gl_CHECK_STRERRORNAME_NP): Test for strerrorname_np using + gl_CHECK_FUNCS_ANDROID instead of AC_CHECK_FUNCS. + 2024-09-04 Bruno Haible Doc regarding functions introduced in Android API level 35. diff --git a/m4/strerrorname_np.m4 b/m4/strerrorname_np.m4 index ac0211715a..3465df2a35 100644 --- a/m4/strerrorname_np.m4 +++ b/m4/strerrorname_np.m4 @@ -1,5 +1,5 @@ # strerrorname_np.m4 -# serial 6 +# serial 7 dnl Copyright (C) 2020-2024 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,11 +17,15 @@ AC_DEFUN([gl_FUNC_STRERRORNAME_NP], esac else HAVE_STRERRORNAME_NP=0 + case "$gl_cv_onwards_func_strerrorname_np" in + future*) REPLACE_STRERRORNAME_NP=1 ;; + esac fi ]) # Check for a working strerrorname_np function. -# Sets ac_cv_func_strerrorname_np, gl_cv_func_strerrorname_np_works. +# Sets ac_cv_func_strerrorname_np, gl_cv_onwards_func_strerrorname_np, +# gl_cv_func_strerrorname_np_works. AC_DEFUN([gl_CHECK_STRERRORNAME_NP], [ dnl Persuade glibc to declare strerrorname_np(). @@ -29,7 +33,7 @@ AC_DEFUN([gl_CHECK_STRERRORNAME_NP], AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles - AC_CHECK_FUNCS([strerrorname_np]) + gl_CHECK_FUNCS_ANDROID([strerrorname_np], [[#include ]]) if test $ac_cv_func_strerrorname_np = yes; then dnl In glibc 2.32, strerrorname_np returns English error descriptions, not dnl error names.