From 6ab639421e3f592ccd831ee592c049bf95be8467 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Tue, 11 Jul 2006 17:48:10 +0000 Subject: [PATCH] re PR libstdc++/28290 (error: 'iconv_t' does not name a type) 2006-07-11 Paolo Carlini PR libstdc++/28290 * include/ext/codecvt_specializations.h: Fix, adding missing includes and guards. From-SVN: r115354 --- libstdc++-v3/ChangeLog | 6 ++++++ .../include/ext/codecvt_specializations.h | 16 ++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 249e6ac3c86..85b05064a1c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2006-07-11 Paolo Carlini + + PR libstdc++/28290 + * include/ext/codecvt_specializations.h: Fix, adding missing + includes and guards. + 2006-07-11 Paolo Carlini PR libstdc++/28277 (partial: collate bits) diff --git a/libstdc++-v3/include/ext/codecvt_specializations.h b/libstdc++-v3/include/ext/codecvt_specializations.h index a83b747000c..1aeb719dc44 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 -/** @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 +#include +#include + // 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 -- 2.30.2