am 2f35f1fa: Merge "Update android-20 wchar.h up to bionic state."

* commit '2f35f1fa51db20695be65668986e44dd80da9616':
  Update android-20 wchar.h up to bionic state.
This commit is contained in:
Andrew Hsieh
2014-05-16 00:30:21 +00:00
committed by Android Git Automerger

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))