diff options
| author | Bruno Haible <bruno@clisp.org> | 2023-01-22 12:43:06 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2023-01-22 15:56:51 +0100 |
| commit | 6f43ec52f0b6c548a974ec46244292106fc48bfe (patch) | |
| tree | 2ded94940d011fcab4af543ed665bbdff0f5ec76 /modules | |
| parent | facb752a0f9b4d609d678791a7a9aecb580ff6e2 (diff) | |
| download | gnulib-6f43ec52f0b6c548a974ec46244292106fc48bfe.tar.gz | |
Resolve conflicts for functions introduced in Android API level 23.
* lib/stdlib.in.h (mkostemp): Consider REPLACE_MKOSTEMP. Disable
_GL_CXXALIASWARN invocation on non-glibc systems.
(mkostemps): Consider REPLACE_MKOSTEMPS. Disable _GL_CXXALIASWARN
invocation on non-glibc systems.
* m4/stdlib_h.m4 (gl_STDLIB_H_DEFAULTS): Initialize REPLACE_MKOSTEMP,
REPLACE_MKOSTEMPS.
* modules/stdlib (Makefile.am): Substitute REPLACE_MKOSTEMP,
REPLACE_MKOSTEMPS.
* m4/mkostemp.m4 (gl_FUNC_MKOSTEMP): Conditionally set REPLACE_MKOSTEMP.
* modules/mkostemp (Depends-on, configure.ac): Consider
REPLACE_MKOSTEMP.
* m4/mkostemps.m4 (gl_FUNC_MKOSTEMPS): Conditionally set
REPLACE_MKOSTEMPS.
* modules/mkostemps (Depends-on, configure.ac): Consider
REPLACE_MKOSTEMPS.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/mkostemp | 5 | ||||
| -rw-r--r-- | modules/mkostemps | 5 | ||||
| -rw-r--r-- | modules/stdlib | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/modules/mkostemp b/modules/mkostemp index 467fb109ae..a47353d427 100644 --- a/modules/mkostemp +++ b/modules/mkostemp @@ -10,11 +10,12 @@ Depends-on: stdlib extensions largefile -tempname [test $HAVE_MKOSTEMP = 0] +tempname [test $HAVE_MKOSTEMP = 0 || test $REPLACE_MKOSTEMP = 1] configure.ac: gl_FUNC_MKOSTEMP -gl_CONDITIONAL([GL_COND_OBJ_MKOSTEMP], [test $HAVE_MKOSTEMP = 0]) +gl_CONDITIONAL([GL_COND_OBJ_MKOSTEMP], + [test $HAVE_MKOSTEMP = 0 || test $REPLACE_MKOSTEMP = 1]) AM_COND_IF([GL_COND_OBJ_MKOSTEMP], [ gl_PREREQ_MKOSTEMP ]) diff --git a/modules/mkostemps b/modules/mkostemps index 92ef9ea29e..3bcb438860 100644 --- a/modules/mkostemps +++ b/modules/mkostemps @@ -10,11 +10,12 @@ Depends-on: stdlib extensions largefile -tempname [test $HAVE_MKOSTEMPS = 0] +tempname [test $HAVE_MKOSTEMPS = 0 || test $REPLACE_MKOSTEMPS = 1] configure.ac: gl_FUNC_MKOSTEMPS -gl_CONDITIONAL([GL_COND_OBJ_MKOSTEMPS], [test $HAVE_MKOSTEMPS = 0]) +gl_CONDITIONAL([GL_COND_OBJ_MKOSTEMPS], + [test $HAVE_MKOSTEMPS = 0 || test $REPLACE_MKOSTEMPS = 1]) gl_MODULE_INDICATOR([mkostemps]) gl_STDLIB_MODULE_INDICATOR([mkostemps]) diff --git a/modules/stdlib b/modules/stdlib index 0be8fb54a5..57f1e40269 100644 --- a/modules/stdlib +++ b/modules/stdlib @@ -139,6 +139,8 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -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_MKOSTEMP''@|$(REPLACE_MKOSTEMP)|g' \ + -e 's|@''REPLACE_MKOSTEMPS''@|$(REPLACE_MKOSTEMPS)|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' \ |