diff options
| author | Paolo Carlini <paolo@gcc.gnu.org> | 2007-04-11 23:10:05 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2007-04-11 23:10:05 +0000 |
| commit | fdc2084a0f4e2e62afebf6f1f448ed9224a2e112 (patch) | |
| tree | 8897d117e2a98429a32ff6262801e299a9ffabae | |
| parent | 13ce12ebc887230b9c9949d39764ed33af7deb6e (diff) | |
| download | gcc-fdc2084a0f4e2e62afebf6f1f448ed9224a2e112.zip gcc-fdc2084a0f4e2e62afebf6f1f448ed9224a2e112.tar.gz gcc-fdc2084a0f4e2e62afebf6f1f448ed9224a2e112.tar.bz2 | |
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 8 | ||||
| -rw-r--r-- | libstdc++-v3/config/locale/gnu/c++locale_internal.h | 1 | ||||
| -rw-r--r-- | libstdc++-v3/config/locale/gnu/c_locale.h | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index e2f075a..69cf154 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,11 @@ 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 declarations. @@ -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>. diff --git a/libstdc++-v3/config/locale/gnu/c++locale_internal.h b/libstdc++-v3/config/locale/gnu/c++locale_internal.h index 6f9b535..cbce169 100644 --- a/libstdc++-v3/config/locale/gnu/c++locale_internal.h +++ b/libstdc++-v3/config/locale/gnu/c++locale_internal.h @@ -38,6 +38,7 @@ #include <bits/c++config.h> #include <clocale> #include <cstdlib> +#include <langinfo.h> #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) diff --git a/libstdc++-v3/config/locale/gnu/c_locale.h b/libstdc++-v3/config/locale/gnu/c_locale.h index bc9db3a..7a71b01 100644 --- a/libstdc++-v3/config/locale/gnu/c_locale.h +++ b/libstdc++-v3/config/locale/gnu/c_locale.h @@ -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> |