diff options
| author | Bruno Haible <bruno@clisp.org> | 2023-01-22 01:23:47 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2023-01-22 15:55:56 +0100 |
| commit | e074cd27a59f9e0ea13088d7889620107510e993 (patch) | |
| tree | 518fa5d958434b4bd7bc1af29e206dd024f25202 /modules/fdatasync | |
| parent | f4b72fccdb381da20f75fda804b37ecb954c8a42 (diff) | |
| download | gnulib-e074cd27a59f9e0ea13088d7889620107510e993.tar.gz | |
Resolve conflicts for functions introduced in Android API level 9.
* lib/unistd.in.h (fdatasync): Consider REPLACE_FDATASYNC. Disable
_GL_CXXALIASWARN invocation on non-glibc systems.
(pipe2): Consider REPLACE_PIPE2. Disable _GL_CXXALIASWARN invocation on
non-glibc systems.
* m4/unistd_h.m4 (gl_UNISTD_H_DEFAULTS): Initialize REPLACE_FDATASYNC,
REPLACE_PIPE2.
* modules/unistd (Makefile.am): Substitute REPLACE_FDATASYNC,
REPLACE_PIPE2.
* m4/fdatasync.m4 (gl_FUNC_FDATASYNC): Test for fdatasync using
gl_CHECK_FUNCS_ANDROID instead of AC_CHECK_FUNCS. Conditionally set
REPLACE_FDATASYNC.
* modules/fdatasync (Depends-on, configure.ac): Consider
REPLACE_FDATASYNC.
* m4/pipe2.m4 (gl_FUNC_PIPE2): Conditionally set REPLACE_PIPE2.
Diffstat (limited to 'modules/fdatasync')
| -rw-r--r-- | modules/fdatasync | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/fdatasync b/modules/fdatasync index 6e0f48df21..4d13a97cdb 100644 --- a/modules/fdatasync +++ b/modules/fdatasync @@ -6,12 +6,12 @@ lib/fdatasync.c m4/fdatasync.m4 Depends-on: -fsync [test $HAVE_FDATASYNC = 0] +fsync [test $HAVE_FDATASYNC = 0 || test $REPLACE_FDATASYNC = 1] unistd configure.ac: gl_FUNC_FDATASYNC -gl_CONDITIONAL([GL_COND_OBJ_FDATASYNC], [test $HAVE_FDATASYNC = 0]) +gl_CONDITIONAL([GL_COND_OBJ_FDATASYNC], [test $HAVE_FDATASYNC = 0 || test $REPLACE_FDATASYNC = 1]) gl_UNISTD_MODULE_INDICATOR([fdatasync]) Makefile.am: |