Commit c99e1067 authored by Bruno Haible's avatar Bruno Haible
Browse files

wchar: Fix test failures on AIX and MSVC (regression from 2019-12-07).

* lib/wchar.in.h (GNULIB_defined_mbstate_t): Do define on AIX and MSVC.
parent b7e45cc1
2019-12-18 Bruno Haible <bruno@clisp.org>
wchar: Fix test failures on AIX and MSVC (regression from 2019-12-07).
* lib/wchar.in.h (GNULIB_defined_mbstate_t): Do define on AIX and MSVC.
2019-12-18 Bruno Haible <bruno@clisp.org>
 
localename: Ensure multithread-safety in future changes.
......@@ -140,12 +140,13 @@ typedef unsigned int rpl_wint_t;
implementing mbrtowc for encodings like UTF-8.
On AIX and MSVC, mbrtowc needs to be overridden, but mbstate_t exists and is
large enough and overriding it would cause problems in C++ mode. */
#if (!(@HAVE_MBSINIT@ && @HAVE_MBRTOWC@) || @REPLACE_MBSTATE_T@) \
&& !(defined _AIX || defined _MSC_VER)
#if !(@HAVE_MBSINIT@ && @HAVE_MBRTOWC@) || @REPLACE_MBSTATE_T@
# if !GNULIB_defined_mbstate_t
# if !(defined _AIX || defined _MSC_VER)
typedef int rpl_mbstate_t;
# undef mbstate_t
# define mbstate_t rpl_mbstate_t
# undef mbstate_t
# define mbstate_t rpl_mbstate_t
# endif
# define GNULIB_defined_mbstate_t 1
# endif
#endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment