From 03fb9902e7dd3de7184ee00d13d14b3ff389c18c Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 4 Sep 2024 10:34:04 +0200 Subject: [PATCH] Resolve conflicts for functions introduced in Android API level 35. * m4/strerrorname_np.m4 (gl_CHECK_STRERRORNAME_NP): Test for strerrorname_np using gl_CHECK_FUNCS_ANDROID instead of AC_CHECK_FUNCS. --- ChangeLog | 7 +++++++ m4/strerrorname_np.m4 | 7 +++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index dc9fea3286..f70472d1ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2024-09-04 Bruno Haible + + Resolve conflicts for functions introduced in Android API level 35. + + * m4/strerrorname_np.m4 (gl_CHECK_STRERRORNAME_NP): Test for + strerrorname_np using gl_CHECK_FUNCS_ANDROID instead of AC_CHECK_FUNCS. + 2024-09-03 Bruno Haible unlockpt tests: Avoid test failure on Haiku. diff --git a/m4/strerrorname_np.m4 b/m4/strerrorname_np.m4 index 352c9ac0c9..9bb97c4e78 100644 --- a/m4/strerrorname_np.m4 +++ b/m4/strerrorname_np.m4 @@ -1,4 +1,4 @@ -# strerrorname_np.m4 serial 5 +# strerrorname_np.m4 serial 5.1 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, @@ -13,7 +13,7 @@ AC_DEFUN([gl_FUNC_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. @@ -59,5 +59,8 @@ 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 ]) -- 2.39.5