diff options
| author | Bruno Haible <bruno@clisp.org> | 2023-01-22 11:55:01 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2023-01-22 15:56:31 +0100 |
| commit | 0244a842e9d5c0670c7ff2bc1cf90a23cbc251ab (patch) | |
| tree | a2c072a2b1e2a41b8135819177f60490782c31b5 /modules | |
| parent | b6b037e627692b276e22f6c3ca6eabedcc535f70 (diff) | |
| download | gnulib-0244a842e9d5c0670c7ff2bc1cf90a23cbc251ab.tar.gz | |
Resolve conflicts for functions introduced in Android API level 21.
* lib/unistd.in.h (dup3): Consider REPLACE_DUP3. Disable
_GL_CXXALIASWARN invocation on non-glibc systems.
* m4/unistd_h.m4 (gl_UNISTD_H_DEFAULTS): Initialize REPLACE_DUP3.
* modules/unistd (Makefile.am): Substitute REPLACE_DUP3.
* m4/dup3.m4 (gl_FUNC_DUP3): Conditionally set REPLACE_DUP3.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/unistd | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/modules/unistd b/modules/unistd index 80080ede9e..065e4ad52e 100644 --- a/modules/unistd +++ b/modules/unistd @@ -179,6 +179,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''REPLACE_COPY_FILE_RANGE''@|$(REPLACE_COPY_FILE_RANGE)|g' \ -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \ -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \ + -e 's|@''REPLACE_DUP3''@|$(REPLACE_DUP3)|g' \ -e 's|@''REPLACE_EXECL''@|$(REPLACE_EXECL)|g' \ -e 's|@''REPLACE_EXECLE''@|$(REPLACE_EXECLE)|g' \ -e 's|@''REPLACE_EXECLP''@|$(REPLACE_EXECLP)|g' \ |