diff options
| author | Bruno Haible <bruno@clisp.org> | 2023-01-22 13:12:02 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2023-01-22 15:56:58 +0100 |
| commit | 6de13dcceb91445233d5d1e26c7498f826d2b8a2 (patch) | |
| tree | cae3e8b3d76d9ee7009051da5df4ccc9877d596b /m4/wchar_h.m4 | |
| parent | 134320a310c64fc3b497618cabc2749bd98735fb (diff) | |
| download | gnulib-6de13dcceb91445233d5d1e26c7498f826d2b8a2.tar.gz | |
Resolve conflicts for functions introduced in Android API level 23.
* lib/wchar.in.h (wmempcpy): Consider REPLACE_WMEMPCPY.
* m4/wchar_h.m4 (gl_WCHAR_H_DEFAULTS): Initialize REPLACE_WMEMPCPY.
* modules/wchar (Makefile.am): Substitute REPLACE_WMEMPCPY.
* m4/wmempcpy.m4 (gl_FUNC_WMEMPCPY): Conditionally set
REPLACE_WMEMPCPY.
* modules/wmempcpy (configure.ac): Consider REPLACE_WMEMPCPY.
Diffstat (limited to 'm4/wchar_h.m4')
| -rw-r--r-- | m4/wchar_h.m4 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/m4/wchar_h.m4 b/m4/wchar_h.m4 index 8ec66193e0..ad3d4ecbb4 100644 --- a/m4/wchar_h.m4 +++ b/m4/wchar_h.m4 @@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. dnl Written by Eric Blake. -# wchar_h.m4 serial 55 +# wchar_h.m4 serial 56 AC_DEFUN_ONCE([gl_WCHAR_H], [ @@ -254,4 +254,5 @@ AC_DEFUN([gl_WCHAR_H_DEFAULTS], REPLACE_WCSWIDTH=0; AC_SUBST([REPLACE_WCSWIDTH]) REPLACE_WCSFTIME=0; AC_SUBST([REPLACE_WCSFTIME]) REPLACE_WCSTOK=0; AC_SUBST([REPLACE_WCSTOK]) + REPLACE_WMEMPCPY=0; AC_SUBST([REPLACE_WMEMPCPY]) ]) |