diff options
| author | Bruno Haible <bruno@clisp.org> | 2023-01-22 11:48:22 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2023-01-22 15:56:27 +0100 |
| commit | daa77bf4aa393cbdec3a5a81ae3dc6923a981f6d (patch) | |
| tree | 4d2cc0e608eb50b6d63bd5aa05adf8a2f843ce25 /modules/getprogname | |
| parent | 8c15a911325fd0166dbeb2f30b78ac02a71fb304 (diff) | |
| download | gnulib-daa77bf4aa393cbdec3a5a81ae3dc6923a981f6d.tar.gz | |
Resolve conflicts for functions introduced in Android API level 21.
* lib/stdlib.in.h (_Exit): Consider REPLACE__EXIT. Disable
_GL_CXXALIASWARN invocation on non-glibc systems.
(getprogname): Consider REPLACE_GETPROGNAME. Disable _GL_CXXALIASWARN
invocation on non-glibc systems.
(posix_openpt): Consider REPLACE_POSIX_OPENPT. Disable _GL_CXXALIASWARN
invocation on non-glibc systems.
* m4/stdlib_h.m4 (gl_STDLIB_H_DEFAULTS): Initialize REPLACE__EXIT,
REPLACE_GETPROGNAME, REPLACE_POSIX_OPENPT.
* modules/stdlib (Makefile.am): Substitute REPLACE__EXIT,
REPLACE_GETPROGNAME, REPLACE_POSIX_OPENPT.
* m4/_Exit.m4 (gl_FUNC__EXIT): Conditionally set REPLACE__EXIT.
* modules/_Exit (configure.ac): Consider REPLACE__EXIT.
* m4/getprogname.m4 (gl_FUNC_GETPROGNAME): Conditionally set
REPLACE_GETPROGNAME.
* modules/getprogname (configure.ac): Consider REPLACE_GETPROGNAME.
* m4/posix_openpt.m4 (gl_FUNC_POSIX_OPENPT): Conditionally set
REPLACE_POSIX_OPENPT.
* modules/posix_openpt (configure.ac): Consider REPLACE_POSIX_OPENPT.
Diffstat (limited to 'modules/getprogname')
| -rw-r--r-- | modules/getprogname | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/getprogname b/modules/getprogname index dadbffbbd6..0631589ee6 100644 --- a/modules/getprogname +++ b/modules/getprogname @@ -14,7 +14,8 @@ open [test $HAVE_GETPROGNAME = 0] configure.ac: gl_FUNC_GETPROGNAME -gl_CONDITIONAL([GL_COND_OBJ_GETPROGNAME], [test $HAVE_GETPROGNAME = 0]) +gl_CONDITIONAL([GL_COND_OBJ_GETPROGNAME], + [test $HAVE_GETPROGNAME = 0 || test $REPLACE_GETPROGNAME = 1]) AM_COND_IF([GL_COND_OBJ_GETPROGNAME], [ gl_PREREQ_GETPROGNAME ]) |