I guess nobody's tried this stuff. I apparently checked in the wrong version

several weeks ago.

include/wchar.h

@@ -68,6 +68,13 @@ typedef unsigned int wint_t;
 #ifndef __mbstate_t_defined
 # define __mbstate_t_defined	1
 /* Conversion state information.  */
+#if 1
+typedef struct
+{
+	wchar_t mask;
+	wchar_t wc;
+} __mbstate_t;
+#else
 typedef struct
 {
   int __count;
@@ -78,6 +85,7 @@ typedef struct
   } __value;		/* Value so far.  */
 } __mbstate_t;
 #endif
+#endif
 #undef __need_mbstate_t