From: Benjamin Kosnik Date: Thu, 4 Jul 2002 00:29:27 +0000 (+0000) Subject: re PR libstdc++/7097 (_GLIBCPP_HAVE_MBSTATE_T breaks non-GLIB systems) X-Git-Tag: releases/gcc-3.1.1~59 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea1e5d659d3f63465c6dd6b6e4a573dc88bb0cfa;p=thirdparty%2Fgcc.git re PR libstdc++/7097 (_GLIBCPP_HAVE_MBSTATE_T breaks non-GLIB systems) 2002-07-03 Benjamin Kosnik PR libstdc++/7097 * include/c/std_cwchar.h: Fix. From-SVN: r55230 --- diff --git a/libstdc++-v3/include/c/std_cwchar.h b/libstdc++-v3/include/c/std_cwchar.h index bad9923fa1e1..d06f5e4efcd7 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