>From d59a6421e9f6cbac3197a33e39d3c3f29a175e52 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 22 Jan 2023 14:13:24 +0100 Subject: [PATCH 34/47] Resolve conflicts for functions introduced in Android API level 23. * m4/mkfifoat.m4 (gl_FUNC_MKFIFOAT): Conditionally set REPLACE_MKFIFOAT. * lib/sys_stat.in.h (mkfifoat): Disable _GL_CXXALIASWARN invocation on non-glibc systems. --- ChangeLog | 4 ++++ lib/sys_stat.in.h | 2 ++ m4/mkfifoat.m4 | 5 ++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 50cf6768b4..6b292af178 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,10 @@ Resolve conflicts for functions introduced in Android API level 23. + * m4/mkfifoat.m4 (gl_FUNC_MKFIFOAT): Conditionally set REPLACE_MKFIFOAT. + * lib/sys_stat.in.h (mkfifoat): Disable _GL_CXXALIASWARN invocation on + non-glibc systems. + * m4/strerror_r.m4 (gl_FUNC_STRERROR_R_WORKS): Conditionally set REPLACE_STRERROR_R. * lib/string.in.h (strerror_r): Disable _GL_CXXALIASWARN invocation on diff --git a/lib/sys_stat.in.h b/lib/sys_stat.in.h index 4ebe121a31..0c2f39c12b 100644 --- a/lib/sys_stat.in.h +++ b/lib/sys_stat.in.h @@ -716,7 +716,9 @@ _GL_FUNCDECL_SYS (mkfifoat, int, (int fd, char const *file, mode_t mode) # endif _GL_CXXALIAS_SYS (mkfifoat, int, (int fd, char const *file, mode_t mode)); # endif +# if __GLIBC__ >= 2 _GL_CXXALIASWARN (mkfifoat); +# endif #elif defined GNULIB_POSIXCHECK # undef mkfifoat # if HAVE_RAW_DECL_MKFIFOAT diff --git a/m4/mkfifoat.m4 b/m4/mkfifoat.m4 index d7311f2557..ed86d5c197 100644 --- a/m4/mkfifoat.m4 +++ b/m4/mkfifoat.m4 @@ -1,4 +1,4 @@ -# serial 8 +# serial 9 # See if we need to provide mkfifoat/mknodat replacement. dnl Copyright (C) 2009-2023 Free Software Foundation, Inc. @@ -62,6 +62,9 @@ AC_DEFUN([gl_FUNC_MKFIFOAT], else # No known system has mkfifoat but not mknodat HAVE_MKFIFOAT=0 + case "$gl_cv_onwards_func_mkfifoat" in + future*) REPLACE_MKFIFOAT=1 ;; + esac HAVE_MKNODAT=0 case "$gl_cv_onwards_func_mknodat" in future*) REPLACE_MKNODAT=1 ;; -- 2.34.1