summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2015-02-19 09:56:53 -0600
committerGregory Nutt <gnutt@nuttx.org>2015-02-19 09:56:53 -0600
commitdef91b011ffcbc84cf743c87d36e5e9fb9e26b54 (patch)
tree54d13b3ecd1135f46e6752b14e406111270e1aa7
parentdb02980097dc3b2edf6d001e13df31236a5b9755 (diff)
downloadnuttx-def91b011ffcbc84cf743c87d36e5e9fb9e26b54.tar.gz
nuttx-def91b011ffcbc84cf743c87d36e5e9fb9e26b54.tar.bz2
nuttx-def91b011ffcbc84cf743c87d36e5e9fb9e26b54.zip
Back out definition of mbstate_t. That is a mistake
-rwxr-xr-xnuttx/include/cxx/cwchar2
-rw-r--r--nuttx/include/wchar.h3
2 files changed, 4 insertions, 1 deletions
diff --git a/nuttx/include/cxx/cwchar b/nuttx/include/cxx/cwchar
index eee3bb64b..67716abbe 100755
--- a/nuttx/include/cxx/cwchar
+++ b/nuttx/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/nuttx/include/wchar.h b/nuttx/include/wchar.h
index 8f7d8ab28..de087f3d1 100644
--- a/nuttx/include/wchar.h
+++ b/nuttx/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>.
*