diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2002-07-03 17:14:21 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2002-07-03 17:14:21 +0000 |
| commit | fcad420e8ff702f5c03de5ce8017f5d471bba0c2 (patch) | |
| tree | e84d241ebb6ef821ac62cec6d226b29c5d0d553d | |
| parent | c7375e612b8be3174bb721964368c71eaa352d15 (diff) | |
| download | gcc-fcad420e8ff702f5c03de5ce8017f5d471bba0c2.zip gcc-fcad420e8ff702f5c03de5ce8017f5d471bba0c2.tar.gz gcc-fcad420e8ff702f5c03de5ce8017f5d471bba0c2.tar.bz2 | |
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | 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 4bfd86a..6235806 100644 --- 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 bad9923..d06f5e4 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 |