diff options
| author | Bruno Haible <bruno@clisp.org> | 2023-01-22 13:01:14 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2023-01-22 15:56:53 +0100 |
| commit | 9746be9cd8ccaebc0e1052c19da8d5644766caad (patch) | |
| tree | 32a7fadb3a38ae8a4e76b3a544f389301171f81f /modules | |
| parent | 6f43ec52f0b6c548a974ec46244292106fc48bfe (diff) | |
| download | gnulib-9746be9cd8ccaebc0e1052c19da8d5644766caad.tar.gz | |
Resolve conflicts for functions introduced in Android API level 23.
* lib/string.in.h (mempcpy): Consider REPLACE_MEMPCPY. Disable
_GL_CXXALIASWARN invocation on non-glibc systems.
* m4/string_h.m4 (gl_STRING_H_DEFAULTS): Initialize REPLACE_MEMPCPY.
* modules/string (Makefile.am): Substitute REPLACE_MEMPCPY.
* m4/mempcpy.m4 (gl_FUNC_STPCPY): Conditionally set REPLACE_MEMPCPY.
* modules/mempcpy (configure.ac): Consider REPLACE_MEMPCPY.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/mempcpy | 3 | ||||
| -rw-r--r-- | modules/string | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/modules/mempcpy b/modules/mempcpy index 142ce7fdca..469dbd8789 100644 --- a/modules/mempcpy +++ b/modules/mempcpy @@ -11,7 +11,8 @@ string configure.ac: gl_FUNC_MEMPCPY -gl_CONDITIONAL([GL_COND_OBJ_MEMPCPY], [test $HAVE_MEMPCPY = 0]) +gl_CONDITIONAL([GL_COND_OBJ_MEMPCPY], + [test $HAVE_MEMPCPY = 0 || test $REPLACE_MEMPCPY = 1]) AM_COND_IF([GL_COND_OBJ_MEMPCPY], [ gl_PREREQ_MEMPCPY ]) diff --git a/modules/string b/modules/string index 03a1b0547c..9bfed12613 100644 --- a/modules/string +++ b/modules/string @@ -108,6 +108,7 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''REPLACE_FFSLL''@|$(REPLACE_FFSLL)|g' \ -e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \ -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \ + -e 's|@''REPLACE_MEMPCPY''@|$(REPLACE_MEMPCPY)|g' \ -e 's|@''REPLACE_FREE''@|$(REPLACE_FREE)|g' \ -e 's|@''REPLACE_STPCPY''@|$(REPLACE_STPCPY)|g' \ -e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \ |