re PR libstdc++/7097 (_GLIBCPP_HAVE_MBSTATE_T breaks non-GLIB systems)

2002-07-03  Benjamin Kosnik  <bkoz@redhat.com>

	PR libstdc++/7097
	* include/c/std_cwchar.h: Fix.

From-SVN: r55216

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 4bfd86ae2779079ac0acfdacd6fc0a856b5c3baf..623580609a122d8be546c725b6f1250d2a4d6d03 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-03  Benjamin Kosnik  <bkoz@redhat.com>
+
+       PR libstdc++/7097
+       * include/c/std_cwchar.h: Fix.
+
 2002-07-02  Benjamin Kosnik  <bkoz@redhat.com>
 
        PR libstdc++/6410

diff --git a/libstdc++-v3/include/c/std_cwchar.h b/libstdc++-v3/include/c/std_cwchar.h
index bad9923fa1e1c57ab844a87f37b5ff056b73cab9..d06f5e4efcd7d75ab3c5e556e5357c8807951870 100644 (file)
--- a/libstdc++-v3/include/c/std_cwchar.h
+++ b/libstdc++-v3/include/c/std_cwchar.h
@@ -47,18 +47,16 @@
 // Need to do a bit of trickery here with mbstate_t as char_traits
 // assumes it is in wchar.h, regardless of wchar_t specializations.
 #ifndef _GLIBCPP_HAVE_MBSTATE_T
-extern "C" 
+namespace std
 {
-  typedef struct 
+  extern "C" 
   {
-    int __fill[6];
-  } mbstate_t;
+    typedef struct 
+    {
+      int __fill[6];
+    } mbstate_t;
+  }
 }
 #endif
 
-namespace std 
-{
-  using ::mbstate_t;
-}
-
 #endif