Change definition of mbstate_t to match glibc

Author: th-otto

include/wchar.h

@@ -31,7 +31,12 @@ extern "C" {
 
 typedef struct
 {
-	unsigned __opaque1, __opaque2;
+  long __count;
+  union
+  {
+    unsigned long __wch;
+    char __wchb[4];
+  } __value;		/* Value so far.  */
 } mbstate_t;
 
 wchar_t *wcscpy (wchar_t *__restrict, const wchar_t *__restrict);

multibyte/mbrtowc.c

@@ -20,7 +20,7 @@ size_t mbrtowc(wchar_t *__restrict wc, const char *__restrict src, size_t n, mbs
 	wchar_t dummy;
 
 	if (!st) st = &internal_state;
-	c = st->__opaque1;
+	c = st->__value.__wch;
 
 	if (!s) {
 		if (c) goto ilseq;
@@ -39,7 +39,7 @@ size_t mbrtowc(wchar_t *__restrict wc, const char *__restrict src, size_t n, mbs
 loop:
 		c = (c<<6) | (*s++-0x80); n--;
 		if (!(c&(1U<<31))) {
-			st->__opaque1 = 0;
+			st->__value.__wch = 0;
 			*wc = c;
 			return N-n;
 		}
@@ -49,10 +49,10 @@ size_t mbrtowc(wchar_t *__restrict wc, const char *__restrict src, size_t n, mbs
 		}
 	}
 
-	st->__opaque1 = c;
+	st->__value.__wch = c;
 	return -2;
 ilseq:
-	st->__opaque1 = 0;
+	st->__value.__wch = 0;
 	errno = EILSEQ;
 	return -1;
 }

multibyte/mbsinit.c

@@ -13,5 +13,5 @@
 
 int mbsinit(const mbstate_t *st)
 {
-	return !st || !st->__opaque1;
+	return !st || !st->__count;
 }

multibyte/mbsnrtowcs.c

@@ -52,7 +52,7 @@ size_t mbsnrtowcs(wchar_t *__restrict wcs, const char **__restrict src, size_t n
 				break;
 			}
 			/* have to roll back partial character */
-			st->__opaque1 = 0;
+			st->__value.__wch = 0;
 			break;
 		}
 		s += l; n -= l;

multibyte/mbsrtowcs.c

@@ -17,9 +17,9 @@ size_t mbsrtowcs(wchar_t *__restrict ws, const char **__restrict src, size_t wn,
 	size_t wn0 = wn;
 	unsigned c = 0;
 
-	if (st && (c = st->__opaque1) != 0) {
+	if (st && (c = st->__value.__wch) != 0) {
 		if (ws) {
-			st->__opaque1 = 0;
+			st->__value.__wch = 0;
 			goto resume;
 		} else {
 			goto resume0;