diff options
| author | Bruno Haible <bruno@clisp.org> | 2023-01-22 01:46:21 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2023-01-22 15:56:07 +0100 |
| commit | 7d2fc0f518407f69846a4c58cd775689b3465bc6 (patch) | |
| tree | 0b4ca89814991df02fca58a901974ef638924aa6 | |
| parent | ca227be2d8649a2a55a4953a97db4f992895440b (diff) | |
| download | gnulib-7d2fc0f518407f69846a4c58cd775689b3465bc6.tar.gz | |
Resolve conflicts for functions introduced in Android API level 12.
* m4/utimensat.m4 (gl_FUNC_UTIMENSAT): Conditionally set
REPLACE_UTIMENSAT.
* lib/sys_stat.in.h (utimensat): Disable _GL_CXXALIASWARN invocation on
non-glibc systems.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/sys_stat.in.h | 2 | ||||
| -rw-r--r-- | m4/utimensat.m4 | 5 |
3 files changed, 10 insertions, 2 deletions
@@ -2,6 +2,11 @@ Resolve conflicts for functions introduced in Android API level 12. + * m4/utimensat.m4 (gl_FUNC_UTIMENSAT): Conditionally set + REPLACE_UTIMENSAT. + * lib/sys_stat.in.h (utimensat): Disable _GL_CXXALIASWARN invocation on + non-glibc systems. + * m4/timegm.m4 (gl_FUNC_TIMEGM): Conditionally set REPLACE_TIMEGM. * lib/time.in.h (timegm): Disable _GL_CXXALIASWARN invocation on non-glibc systems. diff --git a/lib/sys_stat.in.h b/lib/sys_stat.in.h index 096887c016..915cab08fb 100644 --- a/lib/sys_stat.in.h +++ b/lib/sys_stat.in.h @@ -937,7 +937,7 @@ _GL_FUNCDECL_SYS (utimensat, int, (int fd, char const *name, _GL_CXXALIAS_SYS (utimensat, int, (int fd, char const *name, struct timespec const times[2], int flag)); # endif -# if @HAVE_UTIMENSAT@ +# if __GLIBC__ >= 2 && @HAVE_UTIMENSAT@ _GL_CXXALIASWARN (utimensat); # endif #elif defined GNULIB_POSIXCHECK diff --git a/m4/utimensat.m4 b/m4/utimensat.m4 index 1d3db2efa2..1a670bb7b7 100644 --- a/m4/utimensat.m4 +++ b/m4/utimensat.m4 @@ -1,4 +1,4 @@ -# serial 10 +# serial 11 # See if we need to provide utimensat replacement. dnl Copyright (C) 2009-2023 Free Software Foundation, Inc. @@ -16,6 +16,9 @@ AC_DEFUN([gl_FUNC_UTIMENSAT], gl_CHECK_FUNCS_ANDROID([utimensat], [[#include <sys/stat.h>]]) if test $ac_cv_func_utimensat = no; then HAVE_UTIMENSAT=0 + case "$gl_cv_onwards_func_utimensat" in + future*) REPLACE_UTIMENSAT=1 ;; + esac else AC_CACHE_CHECK([whether utimensat works], [gl_cv_func_utimensat_works], |