Merge "Reserve space in mbstate to allow for proper wchar support"

2014-04-30 10:34:08 +00:00
parent 01933d921e eab395e4a8
commit d4ae59dcf2
2 changed files with 10 additions and 3 deletions
--- a/libc/include/wchar.h
+++ b/libc/include/wchar.h
@@ -39,8 +39,15 @@

 __BEGIN_DECLS

-typedef __WINT_TYPE__           wint_t;
-typedef struct { int  dummy; }  mbstate_t;
+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];
+#endif
+} mbstate_t;

 typedef enum {
    WC_TYPE_INVALID = 0,