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 /modules/wchar | |
| 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 'modules/wchar')
| -rw-r--r-- | modules/wchar | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/modules/wchar b/modules/wchar index 58c2d1f368..4a507f0167 100644 --- a/modules/wchar +++ b/modules/wchar @@ -143,6 +143,7 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) -e 's|@''REPLACE_WCSWIDTH''@|$(REPLACE_WCSWIDTH)|g' \ -e 's|@''REPLACE_WCSFTIME''@|$(REPLACE_WCSFTIME)|g' \ -e 's|@''REPLACE_WCSTOK''@|$(REPLACE_WCSTOK)|g' \ + -e 's|@''REPLACE_WMEMPCPY''@|$(REPLACE_WMEMPCPY)|g' \ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ |