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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 249e6ac3c861d85af66cebfb694e510ac885826e..85b05064a1cdba26d1a15769eef068b090be3ae3 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+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)

diff --git a/libstdc++-v3/include/ext/codecvt_specializations.h b/libstdc++-v3/include/ext/codecvt_specializations.h
index a83b747000c8966bd665f3f62dc14422e8971bc2..1aeb719dc447325c5bb2f560a6f69948f85bbcc0 100644 (file)
--- 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