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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@96981 138bc75d-0d04-0410-961f-82ee72b054a4

2 files changed, 10 insertions, 11 deletions

diff --git a/libstdc++-v3/include/c_std/std_cstdio.h b/libstdc++-v3/include/c_std/std_cstdio.h
index f31e58e6f24..57bbb3ddb97 100644
--- a/libstdc++-v3/include/c_std/std_cstdio.h
+++ b/libstdc++-v3/include/c_std/std_cstdio.h
@@ -154,15 +154,16 @@ namespace __gnu_cxx
 {
 #if _GLIBCXX_USE_C99_CHECK || _GLIBCXX_USE_C99_DYNAMIC
   extern "C" int
-    (snprintf)(char * restrict, size_t, const char * restrict, ...);
+  (snprintf)(char * restrict, size_t, const char * restrict, ...);
   extern "C" int
-    (vfscanf)(FILE * restrict, const char * restrict, __gnuc_va_list);
+  (vfscanf)(FILE * restrict, const char * restrict, __gnuc_va_list);
   extern "C" int (vscanf)(const char * restrict, __gnuc_va_list);
   extern "C" int
-    (vsnprintf)(char * restrict, size_t, const char * restrict, __gnuc_va_list);
+  (vsnprintf)(char * restrict, size_t, const char * restrict, __gnuc_va_list);
   extern "C" int
-    (vsscanf)(const char * restrict, const char * restrict, __gnuc_va_list);
+  (vsscanf)(const char * restrict, const char * restrict, __gnuc_va_list);
 #endif
+
 #if !_GLIBCXX_USE_C99_DYNAMIC
   using ::snprintf;
   using ::vfscanf;
diff --git a/libstdc++-v3/include/c_std/std_cwctype.h b/libstdc++-v3/include/c_std/std_cwctype.h
index 970c53a8f3d..86d0dfdab15 100644
--- a/libstdc++-v3/include/c_std/std_cwctype.h
+++ b/libstdc++-v3/include/c_std/std_cwctype.h
@@ -1,6 +1,6 @@
 // -*- C++ -*- forwarding header.
 
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -59,19 +59,18 @@
 # undef iswblank
 #endif
 #undef iswcntrl
+#undef iswctype
 #undef iswdigit
 #undef iswgraph
 #undef iswlower
 #undef iswprint
-#undef iswprint
 #undef iswpunct
 #undef iswspace
 #undef iswupper
 #undef iswxdigit
-#undef iswctype
+#undef towctrans
 #undef towlower
 #undef towupper
-#undef towctrans
 #undef wctrans
 #undef wctype
 
@@ -89,19 +88,18 @@ namespace std
   using ::iswblank;
 #endif
   using ::iswcntrl;
+  using ::iswctype;
   using ::iswdigit;
   using ::iswgraph;
   using ::iswlower;
   using ::iswprint;
-  using ::iswprint;
   using ::iswpunct;
   using ::iswspace;
   using ::iswupper;
   using ::iswxdigit;
-  using ::iswctype;
+  using ::towctrans;
   using ::towlower;
   using ::towupper;
-  using ::towctrans;
   using ::wctrans;
   using ::wctype;
 }