From 2a2bec4eb444f5f48d1e1d20a664bf42b15586e8 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 26 Jan 2024 00:18:45 +0100 Subject: [PATCH] Resolve conflicts for functions introduced in Android API level 34. * m4/freadahead.m4 (gl_FUNC_FREADAHEAD): Test for __freadahead using gl_CHECK_FUNCS_ANDROID instead of AC_CHECK_FUNCS_ONCE. * lib/freadahead.h: Update comment. --- ChangeLog | 8 ++++++++ lib/freadahead.h | 2 +- m4/freadahead.m4 | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3823b7b1d4..460ef86974 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2024-01-25 Bruno Haible + + Resolve conflicts for functions introduced in Android API level 34. + + * m4/freadahead.m4 (gl_FUNC_FREADAHEAD): Test for __freadahead using + gl_CHECK_FUNCS_ANDROID instead of AC_CHECK_FUNCS_ONCE. + * lib/freadahead.h: Update comment. + 2024-01-25 Bruno Haible Resolve conflicts for functions introduced in Android API level 30. diff --git a/lib/freadahead.h b/lib/freadahead.h index 35052c1c19..f4fc26cbd7 100644 --- a/lib/freadahead.h +++ b/lib/freadahead.h @@ -32,7 +32,7 @@ STREAM must not be wide-character oriented. */ -#if HAVE___FREADAHEAD /* musl libc */ +#if HAVE___FREADAHEAD /* musl libc, Android API level ≥ 33 */ # include # define freadahead(stream) __freadahead (stream) diff --git a/m4/freadahead.m4 b/m4/freadahead.m4 index c2352b4616..df7aaa29fe 100644 --- a/m4/freadahead.m4 +++ b/m4/freadahead.m4 @@ -1,4 +1,4 @@ -# freadahead.m4 serial 1 +# freadahead.m4 serial 2 dnl Copyright (C) 2012-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, @@ -6,5 +6,5 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_FREADAHEAD], [ - AC_CHECK_FUNCS_ONCE([__freadahead]) + gl_CHECK_FUNCS_ANDROID([__freadahead], [[#include ]]) ]) -- 2.39.5