From b478c11b85bb7c203f97d1b6f15a581dd7cf7fae Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Thu, 19 Feb 2015 09:56:53 -0600
Subject: [PATCH] Back out definition of mbstate_t.  That is a mistake

---
 include/cxx/cwchar | 2 ++
 include/wchar.h    | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/include/cxx/cwchar b/include/cxx/cwchar
index eee3bb64b50..67716abbe03 100755
--- a/include/cxx/cwchar
+++ b/include/cxx/cwchar
@@ -48,7 +48,9 @@
 
 namespace std
 {
+#if 0 /* Not defined */
   using ::mbstate_t;
+#endif
   using ::wint_t;
   using ::size_t;
 };
diff --git a/include/wchar.h b/include/wchar.h
index 8f7d8ab28b4..de087f3d11b 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -105,13 +105,14 @@ typedef int wint_t;
  *   state, the results are unspecified.
  */
 
+#if 0 /* Not used */
 struct mbstate_s
 {
   int __fill[6];
 };
 
 typedef struct mbstate_s mbstate_t;
-
+#endif
 /* FILE
  *   As described in <stdio.h>.
  *