From abd010bc61b9c4589db23604c3ac8c705b257b0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <korli@users.berlios.de>
Date: Tue, 22 Feb 2005 18:06:35 +0000
Subject: [PATCH] Moved mbstate to wchar.h Restored glibc/wcsmbs/wchar.h

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@11451 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 headers/posix/wchar.h                         | 8 ++++++++
 headers/posix/wchar_t.h                       | 8 --------
 src/kernel/libroot/posix/glibc/wcsmbs/wchar.h | 4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/headers/posix/wchar.h b/headers/posix/wchar.h
index 3cc6fc1063..25c340ccc9 100644
--- a/headers/posix/wchar.h
+++ b/headers/posix/wchar.h
@@ -9,6 +9,14 @@
 
 #include <wchar_t.h>
 
+#define _WINT_T
+typedef unsigned int wint_t;
+
+typedef struct {
+        int             __count;
+        wint_t  __value;
+} mbstate_t;
+
 #include <size_t.h>
 
 int		mbsinit(const mbstate_t *);
diff --git a/headers/posix/wchar_t.h b/headers/posix/wchar_t.h
index 37fee5ad18..5db297e8f1 100644
--- a/headers/posix/wchar_t.h
+++ b/headers/posix/wchar_t.h
@@ -11,13 +11,5 @@
 typedef unsigned short wchar_t;
 #endif
 
-#define _WINT_T
-typedef unsigned int wint_t;
-
-typedef struct {
-	int		__count;
-	wint_t	__value;
-} mbstate_t;
-
 #endif	/* _WCHAR_T_H */
 
diff --git a/src/kernel/libroot/posix/glibc/wcsmbs/wchar.h b/src/kernel/libroot/posix/glibc/wcsmbs/wchar.h
index 1043e551d2..ff37f1ee6d 100644
--- a/src/kernel/libroot/posix/glibc/wcsmbs/wchar.h
+++ b/src/kernel/libroot/posix/glibc/wcsmbs/wchar.h
@@ -36,7 +36,7 @@
 # ifdef __USE_UNIX98
 #  define __need_FILE
 # endif
-# include <stdio.h>
+# include <libio/stdio.h>
 /* Get va_list definition.  */
 # define __need___va_list
 # include <stdarg.h>
@@ -89,7 +89,7 @@ typedef struct
 
 __BEGIN_NAMESPACE_C99
 /* Public type.  */
-//typedef __mbstate_t mbstate_t;
+typedef __mbstate_t mbstate_t;
 __END_NAMESPACE_C99
 #ifdef __USE_GNU
 __USING_NAMESPACE_C99(mbstate_t)