diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2015-02-19 09:21:35 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2015-02-19 09:21:35 -0600 |
| commit | db02980097dc3b2edf6d001e13df31236a5b9755 (patch) | |
| tree | 210b454a157452b53377abbbaebd9d9e06d334f1 | |
| parent | 406c3a3b7ddefbfadbae9ac1858a4b235c7e6cfd (diff) | |
| download | nuttx-db02980097dc3b2edf6d001e13df31236a5b9755.tar.gz nuttx-db02980097dc3b2edf6d001e13df31236a5b9755.tar.bz2 nuttx-db02980097dc3b2edf6d001e13df31236a5b9755.zip | |
Add mbstate_t to wchar.h and cwchar
| -rwxr-xr-x | nuttx/include/cxx/cwchar | 7 | ||||
| -rw-r--r-- | nuttx/include/wchar.h | 21 |
2 files changed, 22 insertions, 6 deletions
diff --git a/nuttx/include/cxx/cwchar b/nuttx/include/cxx/cwchar index 60c261dad..eee3bb64b 100755 --- a/nuttx/include/cxx/cwchar +++ b/nuttx/include/cxx/cwchar @@ -46,4 +46,11 @@ // Namespace //*************************************************************************** +namespace std +{ + using ::mbstate_t; + using ::wint_t; + using ::size_t; +}; + #endif // __INCLUDE_CXX_CWCHAR diff --git a/nuttx/include/wchar.h b/nuttx/include/wchar.h index 54fa79661..8f7d8ab28 100644 --- a/nuttx/include/wchar.h +++ b/nuttx/include/wchar.h @@ -89,8 +89,11 @@ * * wint_t * An integral type capable of storing any valid value of wchar_t, or WEOF. - * - * wctype_t + */ + +typedef int wint_t; + +/* wctype_t * A scalar type of a data object that can hold values which represent * locale-specific character classification. * @@ -100,8 +103,16 @@ * multibyte) characters and wide-characters. If a codeset is being used * such that an mbstate_t needs to preserve more than 2 levels of reserved * state, the results are unspecified. - * - * FILE + */ + +struct mbstate_s +{ + int __fill[6]; +}; + +typedef struct mbstate_s mbstate_t; + +/* FILE * As described in <stdio.h>. * * size_t @@ -110,8 +121,6 @@ * Reference: Opengroup.org */ -typedef int wint_t; - /* "The tag tm is declared as naming an incomplete structure type, the * contents of which are described in the header <time.h>." * |