diff options
| author | Paolo Carlini <pcarlini@suse.de> | 2006-07-11 17:48:10 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2006-07-11 17:48:10 +0000 |
| commit | 6ab639421e3f592ccd831ee592c049bf95be8467 (patch) | |
| tree | 8be308452f121a0b5f93f5831f34279ba7074210 | |
| parent | 36bb088b048126eb29c92a5def5c2f7fe65b2700 (diff) | |
| download | gcc-6ab639421e3f592ccd831ee592c049bf95be8467.zip gcc-6ab639421e3f592ccd831ee592c049bf95be8467.tar.gz gcc-6ab639421e3f592ccd831ee592c049bf95be8467.tar.bz2 | |
re PR libstdc++/28290 (error: 'iconv_t' does not name a type)
2006-07-11 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/28290
* include/ext/codecvt_specializations.h: Fix, adding missing
includes and guards.
From-SVN: r115354
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/ext/codecvt_specializations.h | 16 |
2 files changed, 20 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 249e6ac..85b0506 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,11 @@ 2006-07-11 Paolo Carlini <pcarlini@suse.de> + PR libstdc++/28290 + * include/ext/codecvt_specializations.h: Fix, adding missing + includes and guards. + +2006-07-11 Paolo Carlini <pcarlini@suse.de> + PR libstdc++/28277 (partial: collate bits) * include/bits/locale_facets.tcc (collate<>::do_transform( const _CharT*, const _CharT*)): Avoid __builtin_alloca with no diff --git a/libstdc++-v3/include/ext/codecvt_specializations.h b/libstdc++-v3/include/ext/codecvt_specializations.h index a83b747..1aeb719 100644 --- a/libstdc++-v3/include/ext/codecvt_specializations.h +++ b/libstdc++-v3/include/ext/codecvt_specializations.h @@ -1,6 +1,6 @@ // Locale support (codecvt) -*- C++ -*- -// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 +// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -34,10 +34,19 @@ // Written by Benjamin Kosnik <bkoz@redhat.com> -/** @file bits/codecvt_specializations.h +/** @file ext/codecvt_specializations.h * This file is a GNU extension to the Standard C++ Library. */ +#ifndef _EXT_CODECVT_SPECIALIZATIONS_H +#define _EXT_CODECVT_SPECIALIZATIONS_H 1 + +#ifdef _GLIBCXX_USE_ICONV + +#include <bits/c++config.h> +#include <locale> +#include <iconv.h> + // XXX // Define this here so codecvt.cc can have _S_max_size definition. #define _GLIBCXX_USE_ENCODING_STATE 1 @@ -506,3 +515,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std) _GLIBCXX_END_NAMESPACE +#endif + +#endif |