c_locale.h: Do not include <langinfo.h> and <iconv.h>.

2007-04-11  Paolo Carlini  <pcarlini@suse.de>

	* config/locale/gnu/c_locale.h: Do not include <langinfo.h>
	and <iconv.h>.
	* config/locale/gnu/c++locale_internal.h: Include <langinfo.h>.

From-SVN: r123726
This commit is contained in:
Paolo Carlini 2007-04-11 23:10:05 +00:00
parent 13ce12ebc8
commit fdc2084a0f
3 changed files with 9 additions and 4 deletions

View File

@ -1,3 +1,9 @@
2007-04-11 Paolo Carlini <pcarlini@suse.de>
* config/locale/gnu/c_locale.h: Do not include <langinfo.h>
and <iconv.h>.
* config/locale/gnu/c++locale_internal.h: Include <langinfo.h>.
2007-04-11 Paolo Carlini <pcarlini@suse.de>
* include/std/istream (class basic_istream<>): Remove unneded friend
@ -19,7 +25,7 @@
* testsuite/22_locale/num_put/put/char/1.cc: Tweak comment.
* testsuite/22_locale/num_put/put/wchar_t/1.cc: Likewise.
2007-04-11 Zack Weinberg <zack@mrtock.ucsd.edu>
2007-04-11 Zack Weinberg <zackw@panix.com>
* include/std/iosfwd: Do not include <bits/c++locale.h> and
<bits/functexcept.h>.

View File

@ -38,6 +38,7 @@
#include <bits/c++config.h>
#include <clocale>
#include <cstdlib>
#include <langinfo.h>
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)

View File

@ -1,6 +1,6 @@
// Wrapper for underlying C-language localization -*- C++ -*-
// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
@ -47,8 +47,6 @@
#include <cstring> // get std::strlen
#include <cstdio> // get std::vsnprintf or std::vsprintf
#include <clocale>
#include <langinfo.h> // For codecvt
#include <iconv.h> // For codecvt using iconv, iconv_t
#include <libintl.h> // For messages
#include <cstdarg>