From 88a444d933a2fc67e2c90df3bc6af5b1a95146ff Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 18 Jan 2023 20:41:48 +0100 Subject: [PATCH 3/6] Fix warnings for functions introduced in Android API level 12. * m4/ftruncate.m4 (gl_FUNC_FTRUNCATE): Test for ftruncate using gl_CHECK_FUNCS_ANDROID instead of AC_CHECK_FUNCS_ONCE. * m4/glob.m4 (gl_PREREQ_GLOB): Test for getpwnam_r using gl_CHECK_FUNCS_ANDROID instead of AC_CHECK_FUNCS_ONCE. * m4/nproc.m4 (gl_PREREQ_NPROC): Test for sched_getaffinity using gl_CHECK_FUNCS_ANDROID instead of AC_CHECK_FUNCS. * m4/pread.m4 (gl_FUNC_PREAD): Test for pread using gl_CHECK_FUNCS_ANDROID instead of AC_CHECK_FUNCS_ONCE. * m4/pwrite.m4 (gl_FUNC_PWRITE): Test for pwrite using gl_CHECK_FUNCS_ANDROID instead of AC_CHECK_FUNCS_ONCE. * m4/thread.m4 (gl_THREAD): Test for pthread_atfork using gl_CHECK_FUNCS_ANDROID instead of AC_CHECK_FUNCS. * m4/timegm.m4 (gl_FUNC_TIMEGM): Test for timegm using gl_CHECK_FUNCS_ANDROID instead of AC_CHECK_FUNCS_ONCE. * m4/utimensat.m4 (gl_FUNC_UTIMENSAT): Test for utimensat using gl_CHECK_FUNCS_ANDROID instead of AC_CHECK_FUNCS_ONCE. * m4/utimens.m4 (gl_UTIMENS): Likewise. --- ChangeLog | 21 +++++++++++++++++++++ m4/ftruncate.m4 | 4 ++-- m4/glob.m4 | 4 ++-- m4/nproc.m4 | 6 +++--- m4/pread.m4 | 4 ++-- m4/pwrite.m4 | 4 ++-- m4/thread.m4 | 4 ++-- m4/timegm.m4 | 4 ++-- m4/utimens.m4 | 5 +++-- m4/utimensat.m4 | 4 ++-- 10 files changed, 41 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1b04e507fa..738b2de22a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +2023-01-18 Bruno Haible + + Fix warnings for functions introduced in Android API level 12. + * m4/ftruncate.m4 (gl_FUNC_FTRUNCATE): Test for ftruncate using + gl_CHECK_FUNCS_ANDROID instead of AC_CHECK_FUNCS_ONCE. + * m4/glob.m4 (gl_PREREQ_GLOB): Test for getpwnam_r using + gl_CHECK_FUNCS_ANDROID instead of AC_CHECK_FUNCS_ONCE. + * m4/nproc.m4 (gl_PREREQ_NPROC): Test for sched_getaffinity using + gl_CHECK_FUNCS_ANDROID instead of AC_CHECK_FUNCS. + * m4/pread.m4 (gl_FUNC_PREAD): Test for pread using + gl_CHECK_FUNCS_ANDROID instead of AC_CHECK_FUNCS_ONCE. + * m4/pwrite.m4 (gl_FUNC_PWRITE): Test for pwrite using + gl_CHECK_FUNCS_ANDROID instead of AC_CHECK_FUNCS_ONCE. + * m4/thread.m4 (gl_THREAD): Test for pthread_atfork using + gl_CHECK_FUNCS_ANDROID instead of AC_CHECK_FUNCS. + * m4/timegm.m4 (gl_FUNC_TIMEGM): Test for timegm using + gl_CHECK_FUNCS_ANDROID instead of AC_CHECK_FUNCS_ONCE. + * m4/utimensat.m4 (gl_FUNC_UTIMENSAT): Test for utimensat using + gl_CHECK_FUNCS_ANDROID instead of AC_CHECK_FUNCS_ONCE. + * m4/utimens.m4 (gl_UTIMENS): Likewise. + 2023-01-18 Bruno Haible Fix warnings for functions introduced in Android API level 9. diff --git a/m4/ftruncate.m4 b/m4/ftruncate.m4 index 74c347598d..f48126e856 100644 --- a/m4/ftruncate.m4 +++ b/m4/ftruncate.m4 @@ -1,4 +1,4 @@ -# serial 21 +# serial 22 # See if we need to emulate a missing ftruncate function using _chsize. @@ -10,7 +10,7 @@ AC_DEFUN([gl_FUNC_FTRUNCATE], [ AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) - AC_CHECK_FUNCS_ONCE([ftruncate]) + gl_CHECK_FUNCS_ANDROID([ftruncate], [[#include ]]) if test $ac_cv_func_ftruncate = yes; then m4_ifdef([gl_LARGEFILE], [ AC_REQUIRE([AC_CANONICAL_HOST]) diff --git a/m4/glob.m4 b/m4/glob.m4 index 354581b3be..847f88038f 100644 --- a/m4/glob.m4 +++ b/m4/glob.m4 @@ -1,4 +1,4 @@ -# glob.m4 serial 27 +# glob.m4 serial 28 dnl Copyright (C) 2005-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, @@ -126,5 +126,5 @@ AC_DEFUN([gl_PREREQ_GLOB], AC_REQUIRE([gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE]) AC_CHECK_HEADERS_ONCE([unistd.h]) gl_CHECK_FUNCS_ANDROID([getlogin_r], [[#include ]]) - AC_CHECK_FUNCS_ONCE([getpwnam_r]) + gl_CHECK_FUNCS_ANDROID([getpwnam_r], [[#include ]]) ]) diff --git a/m4/nproc.m4 b/m4/nproc.m4 index 3065b7b9bf..c892ad74b7 100644 --- a/m4/nproc.m4 +++ b/m4/nproc.m4 @@ -1,4 +1,4 @@ -# nproc.m4 serial 5 +# nproc.m4 serial 6 dnl Copyright (C) 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, @@ -25,8 +25,8 @@ AC_DEFUN([gl_PREREQ_NPROC], #endif ]) - AC_CHECK_FUNCS([sched_getaffinity sched_getaffinity_np \ - pstat_getdynamic sysmp sysctl]) + AC_CHECK_FUNCS([sched_getaffinity_np pstat_getdynamic sysmp sysctl]) + gl_CHECK_FUNCS_ANDROID([sched_getaffinity], [[#include ]]) dnl Test whether sched_getaffinity has the expected declaration. dnl glibc 2.3.[0-2]: diff --git a/m4/pread.m4 b/m4/pread.m4 index ac3c1b7d51..8031f910d4 100644 --- a/m4/pread.m4 +++ b/m4/pread.m4 @@ -1,4 +1,4 @@ -# pread.m4 serial 6 +# pread.m4 serial 7 dnl Copyright (C) 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, @@ -12,7 +12,7 @@ AC_DEFUN([gl_FUNC_PREAD], dnl Persuade glibc to declare pread(). AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) - AC_CHECK_FUNCS_ONCE([pread]) + gl_CHECK_FUNCS_ANDROID([pread], [[#include ]]) if test $ac_cv_func_pread = yes; then dnl On HP-UX 11.11 with _FILE_OFFSET_BITS=64, pread() on a file returns 0 dnl instead of a positive value. diff --git a/m4/pwrite.m4 b/m4/pwrite.m4 index f77d4210d6..48c5255f30 100644 --- a/m4/pwrite.m4 +++ b/m4/pwrite.m4 @@ -1,4 +1,4 @@ -# pwrite.m4 serial 6 +# pwrite.m4 serial 7 dnl Copyright (C) 2010-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, @@ -12,7 +12,7 @@ AC_DEFUN([gl_FUNC_PWRITE], dnl Persuade glibc to declare pwrite(). AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) - AC_CHECK_FUNCS_ONCE([pwrite]) + gl_CHECK_FUNCS_ANDROID([pwrite], [[#include ]]) if test $ac_cv_func_pwrite = yes; then dnl On HP-UX 11.11 with _FILE_OFFSET_BITS=64, pwrite() on a file does not dnl fail when an invalid (negative) offset is passed and uses an arbitrary diff --git a/m4/thread.m4 b/m4/thread.m4 index 12515f6a93..9c63df39da 100644 --- a/m4/thread.m4 +++ b/m4/thread.m4 @@ -1,4 +1,4 @@ -# thread.m4 serial 3 +# thread.m4 serial 4 dnl Copyright (C) 2008-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, @@ -11,7 +11,7 @@ AC_DEFUN([gl_THREAD], if test $gl_threads_api = posix; then gl_save_LIBS="$LIBS" LIBS="$LIBS $LIBMULTITHREAD" - AC_CHECK_FUNCS([pthread_atfork]) + gl_CHECK_FUNCS_ANDROID([pthread_atfork], [[#include ]]) LIBS="$gl_save_LIBS" fi ]) diff --git a/m4/timegm.m4 b/m4/timegm.m4 index 6079f1a39c..fa84e98db3 100644 --- a/m4/timegm.m4 +++ b/m4/timegm.m4 @@ -1,4 +1,4 @@ -# timegm.m4 serial 13 +# timegm.m4 serial 14 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, @@ -9,7 +9,7 @@ AC_DEFUN([gl_FUNC_TIMEGM], AC_REQUIRE([gl_TIME_H_DEFAULTS]) AC_REQUIRE([gl_FUNC_MKTIME_WORKS]) REPLACE_TIMEGM=0 - AC_CHECK_FUNCS_ONCE([timegm]) + gl_CHECK_FUNCS_ANDROID([timegm], [[#include ]]) if test $ac_cv_func_timegm = yes; then if test "$gl_cv_func_working_mktime" != yes; then # Assume that timegm is buggy if mktime is. diff --git a/m4/utimens.m4 b/m4/utimens.m4 index c5d9b69e6f..900b4f6aa3 100644 --- a/m4/utimens.m4 +++ b/m4/utimens.m4 @@ -3,7 +3,7 @@ dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. -dnl serial 12 +dnl serial 13 AC_DEFUN([gl_UTIMENS], [ @@ -11,9 +11,10 @@ AC_DEFUN([gl_UTIMENS], AC_REQUIRE([gl_FUNC_UTIMES]) AC_REQUIRE([gl_CHECK_TYPE_STRUCT_TIMESPEC]) AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles - AC_CHECK_FUNCS_ONCE([futimens utimensat lutimes]) + AC_CHECK_FUNCS_ONCE([futimens lutimes]) gl_CHECK_FUNCS_ANDROID([futimes], [[#include ]]) gl_CHECK_FUNCS_ANDROID([futimesat], [[#include ]]) + gl_CHECK_FUNCS_ANDROID([utimensat], [[#include ]]) if test $ac_cv_func_futimens = no && test $ac_cv_func_futimesat = yes; then dnl FreeBSD 8.0-rc2 mishandles futimesat(fd,NULL,time). It is not diff --git a/m4/utimensat.m4 b/m4/utimensat.m4 index dd210fc989..1d3db2efa2 100644 --- a/m4/utimensat.m4 +++ b/m4/utimensat.m4 @@ -1,4 +1,4 @@ -# serial 9 +# serial 10 # See if we need to provide utimensat replacement. dnl Copyright (C) 2009-2023 Free Software Foundation, Inc. @@ -13,7 +13,7 @@ AC_DEFUN([gl_FUNC_UTIMENSAT], AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles - AC_CHECK_FUNCS_ONCE([utimensat]) + gl_CHECK_FUNCS_ANDROID([utimensat], [[#include ]]) if test $ac_cv_func_utimensat = no; then HAVE_UTIMENSAT=0 else -- 2.34.1