diff options
| author | Bruno Haible <bruno@clisp.org> | 2023-01-22 14:16:36 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2023-01-22 15:57:11 +0100 |
| commit | 31617d81c53135e56f943299f54fd26acc3afe79 (patch) | |
| tree | a8e6b88b2394c08693d107ef12bf83c0ed6e5832 /modules | |
| parent | 98a7c3a0cb97db93cabf376cbef7fbb81d4f4023 (diff) | |
| download | gnulib-31617d81c53135e56f943299f54fd26acc3afe79.tar.gz | |
Resolve conflicts for functions introduced in Android API level 26.
* lib/stdlib.in.h (getsubopt): Consider REPLACE_GETSUBOPT. Disable
_GL_CXXALIASWARN invocation on non-glibc systems.
* m4/stdlib_h.m4 (gl_STDLIB_H_DEFAULTS): Initialize REPLACE_GETSUBOPT.
* modules/stdlib (Makefile.am): Substitute REPLACE_GETSUBOPT.
* m4/getsubopt.m4 (gl_FUNC_GETSUBOPT): Conditionally set
REPLACE_GETSUBOPT.
* modules/getsubopt (Depends-on, configure.ac): Consider
REPLACE_GETSUBOPT.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/getsubopt | 7 | ||||
| -rw-r--r-- | modules/stdlib | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/modules/getsubopt b/modules/getsubopt index 0b0d23d56d..bdabdd76d5 100644 --- a/modules/getsubopt +++ b/modules/getsubopt @@ -8,12 +8,13 @@ m4/getsubopt.m4 Depends-on: stdlib extensions -strchrnul [test $HAVE_GETSUBOPT = 0] -memchr [test $HAVE_GETSUBOPT = 0] +strchrnul [test $HAVE_GETSUBOPT = 0 || test $REPLACE_GETSUBOPT = 1] +memchr [test $HAVE_GETSUBOPT = 0 || test $REPLACE_GETSUBOPT = 1] configure.ac: gl_FUNC_GETSUBOPT -gl_CONDITIONAL([GL_COND_OBJ_GETSUBOPT], [test $HAVE_GETSUBOPT = 0]) +gl_CONDITIONAL([GL_COND_OBJ_GETSUBOPT], + [test $HAVE_GETSUBOPT = 0 || test $REPLACE_GETSUBOPT = 1]) AM_COND_IF([GL_COND_OBJ_GETSUBOPT], [ gl_PREREQ_GETSUBOPT ]) diff --git a/modules/stdlib b/modules/stdlib index 57f1e40269..5ae3e6665d 100644 --- a/modules/stdlib +++ b/modules/stdlib @@ -135,6 +135,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ -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_GETSUBOPT''@|$(REPLACE_GETSUBOPT)|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' \ |