diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2005-03-24 05:45:45 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2005-03-24 05:45:45 +0000 |
| commit | 347669a079a7005bf211e57cba5db24d0b99f2f3 (patch) | |
| tree | 15858b7da5b678b1ba495dd35826662b01a72d3a /libstdc++-v3/config | |
| parent | a53ed3ded702e70cf720a032e880756d3bd4ed0b (diff) | |
| download | gcc-347669a079a7005bf211e57cba5db24d0b99f2f3.zip gcc-347669a079a7005bf211e57cba5db24d0b99f2f3.tar.gz gcc-347669a079a7005bf211e57cba5db24d0b99f2f3.tar.bz2 | |
acinclude.m4: Adjust so that _GLIBCXX_USE_C99 implies using _GLIBCXX_USE_C99_COMPLEX...
2005-03-23 Benjamin Kosnik <bkoz@redhat.com>
* acinclude.m4: Adjust so that _GLIBCXX_USE_C99 implies
using _GLIBCXX_USE_C99_COMPLEX, _GLIBCXX_USE_C99_MATH, and
_GLIBCXX_USE_C99_WCHAR.
Remove GLIBCXX_ENABLE_C_MBCHAR, consolidate in GLIBCXX_ENABLE_C99
and GLIBCXX_ENABLE_WCHAR_T.
Take C99 bits from GLIBCXX_CHECK_WCHAR_T_SUPPORT and put in
GLIBCXX_ENABLE_C99.
Change remaining parts of GLIBCXX_CHECK_WCHAR_T_SUPPORT to
GLIBCXX_CHECK_ICONV_SUPPORT.
* configure.ac: Remove GLIBCXX_ENABLE_C_MBCHAR, use
GLIBCXX_CHECK_ICONV_SUPPORT and GLIBCXX_ENABLE_WCHAR_T.
* crossconfig.m4: Same.
* acconfig.h: Same, adjust comments.
* config.h.in: Regenerate.
* configure: Regenerate.
* docs/html/configopts.html: Change --enable-c-mbchar to
--enable-wchar_t.
* config/locale/gnu/c++locale_internal.h: Guard wide functions
with _GLIBCXX_USE_WCHAR_T.
* include/c_std/std_cwctype.h: Alphabetize, remove duplicates.
* include/c_std/std_cstdio.h: Spacing.
* config/locale/gnu/c_locale.h: Tweaks for unused warnings.
* src/debug.cc: Same.
From-SVN: r96981
Diffstat (limited to 'libstdc++-v3/config')
| -rw-r--r-- | libstdc++-v3/config/locale/gnu/c++locale_internal.h | 16 | ||||
| -rw-r--r-- | libstdc++-v3/config/locale/gnu/c_locale.h | 6 |
2 files changed, 14 insertions, 8 deletions
diff --git a/libstdc++-v3/config/locale/gnu/c++locale_internal.h b/libstdc++-v3/config/locale/gnu/c++locale_internal.h index 8aa5b56..dc049ef 100644 --- a/libstdc++-v3/config/locale/gnu/c++locale_internal.h +++ b/libstdc++-v3/config/locale/gnu/c++locale_internal.h @@ -1,6 +1,6 @@ // Prototypes for GLIBC thread locale __-prefixed functions -*- C++ -*- -// Copyright (C) 2002, 2004 Free Software Foundation, Inc. +// Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -29,11 +29,11 @@ // Written by Jakub Jelinek <jakub@redhat.com> +#include <bits/c++config.h> #include <clocale> #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) -extern "C" __typeof(iswctype_l) __iswctype_l; extern "C" __typeof(nl_langinfo_l) __nl_langinfo_l; extern "C" __typeof(strcoll_l) __strcoll_l; extern "C" __typeof(strftime_l) __strftime_l; @@ -41,15 +41,19 @@ extern "C" __typeof(strtod_l) __strtod_l; extern "C" __typeof(strtof_l) __strtof_l; extern "C" __typeof(strtold_l) __strtold_l; extern "C" __typeof(strxfrm_l) __strxfrm_l; +extern "C" __typeof(newlocale) __newlocale; +extern "C" __typeof(freelocale) __freelocale; +extern "C" __typeof(duplocale) __duplocale; +extern "C" __typeof(uselocale) __uselocale; + +#ifdef _GLIBCXX_USE_WCHAR_T +extern "C" __typeof(iswctype_l) __iswctype_l; extern "C" __typeof(towlower_l) __towlower_l; extern "C" __typeof(towupper_l) __towupper_l; extern "C" __typeof(wcscoll_l) __wcscoll_l; extern "C" __typeof(wcsftime_l) __wcsftime_l; extern "C" __typeof(wcsxfrm_l) __wcsxfrm_l; extern "C" __typeof(wctype_l) __wctype_l; -extern "C" __typeof(newlocale) __newlocale; -extern "C" __typeof(freelocale) __freelocale; -extern "C" __typeof(duplocale) __duplocale; -extern "C" __typeof(uselocale) __uselocale; +#endif #endif // GLIBC 2.3 and later diff --git a/libstdc++-v3/config/locale/gnu/c_locale.h b/libstdc++-v3/config/locale/gnu/c_locale.h index b6082a2..c995506 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 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -66,7 +66,9 @@ namespace std // be avoided. template<typename _Tv> int - __convert_from_v(char* __out, const int __size, const char* __fmt, + __convert_from_v(char* __out, + const int __size __attribute__ ((__unused__)), + const char* __fmt, #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) _Tv __v, const __c_locale& __cloc, int __prec) { |