commit 4e1ef367729af40395407755b9fa237040cc47d4
author Arseniy Antonov <arseniy.antonov@intel.com> Thu May 15 18:46:09 2014 +0400
committer Arseniy Antonov <arseniy.antonov@intel.com> Thu May 15 18:48:19 2014 +0400
tree 4463b496559ba43c4e5a219bd115e21b69b4a96e
parent a5afedd2e21846f8cd8d662c4a7ef7ec3dc6dfee

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>

ndk/platforms/android-20/include/wchar.h

diff --git a/ndk/platforms/android-20/include/wchar.h b/ndk/platforms/android-20/include/wchar.h
index fe2fe07..af7593f 100644
--- a/ndk/platforms/android-20/include/wchar.h
+++ b/ndk/platforms/android-20/include/wchar.h
@@ -41,15 +41,13 @@
 
 typedef __WINT_TYPE__  wint_t;
 typedef struct {
-#ifdef __LP32__
-  int dummy;
-#else
-  // 8 bytes should be enough to support at least UTF-8
-  char __reserved[8];
+  uint8_t __seq[4];
+#ifdef __LP64__
+  char __reserved[4];
 #endif
 } mbstate_t;
 
-typedef enum {
+enum {
     WC_TYPE_INVALID = 0,
     WC_TYPE_ALNUM,
     WC_TYPE_ALPHA,
@@ -64,7 +62,9 @@
     WC_TYPE_UPPER,
     WC_TYPE_XDIGIT,
     WC_TYPE_MAX
-} wctype_t;
+};
+
+typedef long wctype_t;
 
 #define  WEOF        ((wint_t)(-1))