diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-12-28 06:19:42 -0500 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2012-01-01 07:17:22 -0500 |
| commit | db6af3ebf46a83b885455dc03a3c2c1c2c2dedec (patch) | |
| tree | 942a59c7de0033cf9ab3231523130c323fa4b80c /wcsmbs/wchar.h | |
| parent | 8ea79a616e43093f403927e425c197afe39196b7 (diff) | |
| download | glibc-db6af3ebf46a83b885455dc03a3c2c1c2c2dedec.tar.gz glibc-db6af3ebf46a83b885455dc03a3c2c1c2c2dedec.tar.xz glibc-db6af3ebf46a83b885455dc03a3c2c1c2c2dedec.zip | |
Add uchar.h support, part 1
c16 support for locales other than the C locale is still missing.
Diffstat (limited to 'wcsmbs/wchar.h')
| -rw-r--r-- | wcsmbs/wchar.h | 8 |
1 files changed, 6 insertions, 2 deletions
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 |