From db6af3ebf46a83b885455dc03a3c2c1c2c2dedec Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 28 Dec 2011 06:19:42 -0500 Subject: Add uchar.h support, part 1 c16 support for locales other than the C locale is still missing. --- wcsmbs/wchar.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'wcsmbs/wchar.h') diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h index 2b35f51ad6..ccaaed8f49 100644 --- a/wcsmbs/wchar.h +++ b/wcsmbs/wchar.h @@ -77,8 +77,8 @@ __END_NAMESPACE_STD # endif #endif -#if (defined _WCHAR_H || defined __need_mbstate_t) && !defined __mbstate_t_defined -# define __mbstate_t_defined 1 +#if (defined _WCHAR_H || defined __need_mbstate_t) && !defined ____mbstate_t_defined +# define ____mbstate_t_defined 1 /* Conversion state information. */ typedef struct { @@ -101,10 +101,14 @@ typedef struct defined. */ #ifdef _WCHAR_H +# ifndef __mbstate_t_defined __BEGIN_NAMESPACE_C99 /* Public type. */ typedef __mbstate_t mbstate_t; __END_NAMESPACE_C99 +# define __mbstate_t_defined 1 +# endif + #ifdef __USE_GNU __USING_NAMESPACE_C99(mbstate_t) #endif -- cgit v1.2.3