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 /m4 | |
| 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 'm4')
| -rw-r--r-- | m4/mempcpy.m4 | 5 | ||||
| -rw-r--r-- | m4/string_h.m4 | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/m4/mempcpy.m4 b/m4/mempcpy.m4 index d663b67174..612b77b3c1 100644 --- a/m4/mempcpy.m4 +++ b/m4/mempcpy.m4 @@ -1,4 +1,4 @@ -# mempcpy.m4 serial 13 +# mempcpy.m4 serial 14 dnl Copyright (C) 2003-2004, 2006-2007, 2009-2023 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation @@ -17,6 +17,9 @@ AC_DEFUN([gl_FUNC_MEMPCPY], gl_CHECK_FUNCS_ANDROID([mempcpy], [[#include <string.h>]]) if test $ac_cv_func_mempcpy = no; then HAVE_MEMPCPY=0 + case "$gl_cv_onwards_func_mempcpy" in + future*) REPLACE_MEMPCPY=1 ;; + esac fi ]) diff --git a/m4/string_h.m4 b/m4/string_h.m4 index 132ed87d6a..7f51391cbf 100644 --- a/m4/string_h.m4 +++ b/m4/string_h.m4 @@ -5,7 +5,7 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 36 +# serial 37 # Written by Paul Eggert. @@ -131,6 +131,7 @@ AC_DEFUN([gl_STRING_H_DEFAULTS], REPLACE_FFSLL=0; AC_SUBST([REPLACE_FFSLL]) REPLACE_MEMCHR=0; AC_SUBST([REPLACE_MEMCHR]) REPLACE_MEMMEM=0; AC_SUBST([REPLACE_MEMMEM]) + REPLACE_MEMPCPY=0; AC_SUBST([REPLACE_MEMPCPY]) REPLACE_STPCPY=0; AC_SUBST([REPLACE_STPCPY]) REPLACE_STPNCPY=0; AC_SUBST([REPLACE_STPNCPY]) REPLACE_STRCHRNUL=0; AC_SUBST([REPLACE_STRCHRNUL]) |