Update android-20 wchar.h up to bionic state.

Corresponding changes in bionic:
Ia9bd0785bc42c7b46e2bb6c3d9b9a9d3f769d983
I5abdc7cc3c27c109b7900c94b112f18a95c35763

Change-Id: Ie86fd15226fe552b6f0e60c24debbe1d79f7a332
Signed-off-by: Arseniy Antonov <arseniy.antonov@intel.com>
This commit is contained in:
Arseniy Antonov
2014-05-15 18:46:09 +04:00
parent a5afedd2e2
commit 4e1ef36772

View File

@@ -41,15 +41,13 @@ __BEGIN_DECLS
typedef __WINT_TYPE__ wint_t; typedef __WINT_TYPE__ wint_t;
typedef struct { typedef struct {
#ifdef __LP32__ uint8_t __seq[4];
int dummy; #ifdef __LP64__
#else char __reserved[4];
// 8 bytes should be enough to support at least UTF-8
char __reserved[8];
#endif #endif
} mbstate_t; } mbstate_t;
typedef enum { enum {
WC_TYPE_INVALID = 0, WC_TYPE_INVALID = 0,
WC_TYPE_ALNUM, WC_TYPE_ALNUM,
WC_TYPE_ALPHA, WC_TYPE_ALPHA,
@@ -64,7 +62,9 @@ typedef enum {
WC_TYPE_UPPER, WC_TYPE_UPPER,
WC_TYPE_XDIGIT, WC_TYPE_XDIGIT,
WC_TYPE_MAX WC_TYPE_MAX
} wctype_t; };
typedef long wctype_t;
#define WEOF ((wint_t)(-1)) #define WEOF ((wint_t)(-1))