From e44a41e906b5fe27d0101dfbec5ca00e65bf1fe2 Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Wed, 3 Jul 2002 17:14:21 +0000 Subject: 2002-07-03 Benjamin Kosnik PR libstdc++/7097 * include/c/std_cwchar.h: Fix. git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@55216 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/include/c/std_cwchar.h | 16 +++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 4bfd86ae277..623580609a1 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2002-07-03 Benjamin Kosnik + + PR libstdc++/7097 + * include/c/std_cwchar.h: Fix. + 2002-07-02 Benjamin Kosnik PR libstdc++/6410 diff --git a/libstdc++-v3/include/c/std_cwchar.h b/libstdc++-v3/include/c/std_cwchar.h index bad9923fa1e..d06f5e4efcd 100644 --- 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 -- cgit v1.2.3