diff options
Diffstat (limited to 'lib/gllib')
| -rw-r--r-- | lib/gllib/Makefile.am | 1 | ||||
| -rw-r--r-- | lib/gllib/wchar.in.h | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/gllib/Makefile.am b/lib/gllib/Makefile.am index 87ac01e..1a824d7 100644 --- a/lib/gllib/Makefile.am +++ b/lib/gllib/Makefile.am @@ -143,6 +143,7 @@ wchar.h: wchar.in.h -e 's|@''REPLACE_MBSNRTOWCS''@|$(REPLACE_MBSNRTOWCS)|g' \ -e 's|@''REPLACE_WCRTOMB''@|$(REPLACE_WCRTOMB)|g' \ -e 's|@''REPLACE_WCSRTOMBS''@|$(REPLACE_WCSRTOMBS)|g' \ + -e 's|@''REPLACE_WCSNRTOMBS''@|$(REPLACE_WCSNRTOMBS)|g' \ -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ < $(srcdir)/wchar.in.h; \ diff --git a/lib/gllib/wchar.in.h b/lib/gllib/wchar.in.h index 89d6036..9f5b963 100644 --- a/lib/gllib/wchar.in.h +++ b/lib/gllib/wchar.in.h @@ -264,7 +264,11 @@ extern size_t wcsrtombs (char *dest, const wchar_t **srcp, size_t len, mbstate_t /* Convert a wide string to a string. */ #if @GNULIB_WCSNRTOMBS@ -# if !@HAVE_WCSNRTOMBS@ +# if @REPLACE_WCSNRTOMBS@ +# undef wcsnrtombs +# define wcsnrtombs rpl_wcsnrtombs +# endif +# if !@HAVE_WCSNRTOMBS@ || @REPLACE_WCSNRTOMBS@ extern size_t wcsnrtombs (char *dest, const wchar_t **srcp, size_t srclen, size_t len, mbstate_t *ps); # endif #elif defined GNULIB_POSIXCHECK |