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 | |
| 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')
| -rw-r--r-- | modules/_Exit | 3 | ||||
| -rw-r--r-- | modules/getprogname | 3 | ||||
| -rw-r--r-- | modules/posix_openpt | 3 | ||||
| -rw-r--r-- | modules/stdlib | 3 |
4 files changed, 9 insertions, 3 deletions
diff --git a/modules/_Exit b/modules/_Exit index fa4bde0554..75f0399e88 100644 --- a/modules/_Exit +++ b/modules/_Exit @@ -11,7 +11,8 @@ unistd configure.ac: gl_FUNC__EXIT -gl_CONDITIONAL([GL_COND_OBJ__EXIT], [test $HAVE__EXIT = 0]) +gl_CONDITIONAL([GL_COND_OBJ__EXIT], + [test $HAVE__EXIT = 0 || test $REPLACE__EXIT = 1]) AM_COND_IF([GL_COND_OBJ__EXIT], [ gl_PREREQ__EXIT ]) 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 ]) diff --git a/modules/posix_openpt b/modules/posix_openpt index 96a4229879..1b065e10d0 100644 --- a/modules/posix_openpt +++ b/modules/posix_openpt @@ -11,7 +11,8 @@ stdlib configure.ac: gl_FUNC_POSIX_OPENPT -gl_CONDITIONAL([GL_COND_OBJ_POSIX_OPENPT], [test $HAVE_POSIX_OPENPT = 0]) +gl_CONDITIONAL([GL_COND_OBJ_POSIX_OPENPT], + [test $HAVE_POSIX_OPENPT = 0 || test $REPLACE_POSIX_OPENPT = 1]) gl_STDLIB_MODULE_INDICATOR([posix_openpt]) Makefile.am: diff --git a/modules/stdlib b/modules/stdlib index 1e6e18f53c..0be8fb54a5 100644 --- a/modules/stdlib +++ b/modules/stdlib @@ -128,17 +128,20 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \ -e 's|@''HAVE_UNLOCKPT''@|$(HAVE_UNLOCKPT)|g' \ -e 's|@''HAVE_DECL_UNSETENV''@|$(HAVE_DECL_UNSETENV)|g' \ + -e 's|@''REPLACE__EXIT''@|$(REPLACE__EXIT)|g' \ -e 's|@''REPLACE_ALIGNED_ALLOC''@|$(REPLACE_ALIGNED_ALLOC)|g' \ -e 's|@''REPLACE_CALLOC_FOR_CALLOC_GNU''@|$(REPLACE_CALLOC_FOR_CALLOC_GNU)|g' \ -e 's|@''REPLACE_CALLOC_FOR_CALLOC_POSIX''@|$(REPLACE_CALLOC_FOR_CALLOC_POSIX)|g' \ -e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|$(REPLACE_CANONICALIZE_FILE_NAME)|g' \ -e 's|@''REPLACE_FREE''@|$(REPLACE_FREE)|g' \ + -e 's|@''REPLACE_GETPROGNAME''@|$(REPLACE_GETPROGNAME)|g' \ -e 's|@''REPLACE_INITSTATE''@|$(REPLACE_INITSTATE)|g' \ -e 's|@''REPLACE_MALLOC_FOR_MALLOC_GNU''@|$(REPLACE_MALLOC_FOR_MALLOC_GNU)|g' \ -e 's|@''REPLACE_MALLOC_FOR_MALLOC_POSIX''@|$(REPLACE_MALLOC_FOR_MALLOC_POSIX)|g' \ -e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \ -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \ -e 's|@''REPLACE_POSIX_MEMALIGN''@|$(REPLACE_POSIX_MEMALIGN)|g' \ + -e 's|@''REPLACE_POSIX_OPENPT''@|$(REPLACE_POSIX_OPENPT)|g' \ -e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \ -e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \ -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \ |