[v3] std_cwchar.h "C" header fixes

[Benjamin Kosnik <bkoz at redhat dot com>]

Ok....this should be the last of it.

nathan, alex, etc. others who have reported difficulty with this
header, pleast try now.

tested x86-linux
tested x86-linux x powerpc-eabism
tested powerpc-linux

in on branch and trunk


2001-06-10  Benjamin Kosnik  <bkoz@redhat.com>

	* include/c_std/bits/std_cwchar.h: Alphabetize.
	* include/bits/char_traits.h: Tweak.
	* acinclude.m4 (GLIBCPP_CHECK_WCHAR_T_SUPPORT): Check for
	everything used by std_cwchar.h.
	* aclocal.m4: Regenerate.
	* configure.in: Regenerate.
	* config.h.in: Regenerate.
	
Index: acinclude.m4
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/acinclude.m4,v
retrieving revision 1.154
diff -r1.154 acinclude.m4
816,817c816,818
<     AC_CHECK_FUNCS(wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset \
<     wcsrtombs mbsrtowcs, ac_wfuncs=yes, ac_wfuncs=no)
---
>     ac_wfuncs=yes
>     AC_CHECK_FUNCS(wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset,, \
>     ac_wfuncs=no)
819,820c820,827
<     dnl Do quick checks for things injected into std:: by the c_std headers.
<     AC_CHECK_FUNCS(fgetwc, fgetws)
---
>     dnl Checks for names injected into std:: by the c_std headers.
>     AC_CHECK_FUNCS(btowc wctob fgetwc fgetwc fgetws fputwc fputws fwide \
>     fwprintf fwscanf swprintf swscanf vfwprintf vfwscanf vswprintf vswscanf \
>     vwprintf vwscanf wprintf wscanf getwc getwchar mbsinit mbrlen mbrtowc \
>     mbsrtowcs wcsrtombs putwc putwchar ungetwc wcrtomb wcstod wcstof wcstol \
>     wcstoul wcscpy wcsncpy wcscat wcsncat wcscmp wcscoll wcsncmp wcsxfrm \
>     wcscspn wcsspn wcstok wcsftime wcschr wcspbrk wcsrchr wcsstr,, \
>     ac_wfuncs=no)
859c866
<        && test x"$ac_XPG2_wchar_t" = xyes; then
---
>     && test x"$ac_XPG2_wchar_t" = xyes; then
1329a1337
>   # XXX the wchar.h checks should be rolled into the general C99 bits.
1331c1339
<   AC_MSG_CHECKING([for ISO C99 support in <wchar.h>])
---
>   AC_MSG_CHECKING([for additional ISO C99 support in <wchar.h>])
1342,1343c1350,1351
< 	|| test x"$ac_c99_stdlib" = x"no" \
< 	|| test x"$ac_c99_wchar" = x"no"; then
---
>       || test x"$ac_c99_stdlib" = x"no" \
>       || test x"$ac_c99_wchar" = x"no"; then
Index: include/bits/char_traits.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/bits/char_traits.h,v
retrieving revision 1.8
diff -r1.8 char_traits.h
273d272
< 
Index: include/c_std/bits/std_cwchar.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/c_std/bits/std_cwchar.h,v
retrieving revision 1.15
diff -r1.15 std_cwchar.h
64,65d63
< #undef wctob
< #undef fgetwc
73,82d70
< #undef swprintf
< #undef swscanf
< #undef vfwprintf
< #undef vfwscanf
< #undef vswprintf
< #undef vswscanf
< #undef vwprintf
< #undef vwscanf
< #undef wprintf
< #undef wscanf
85d72
< #undef mbsinit
87a75
> #undef mbsinit
89d76
< #undef wcsrtombs
91a79,80
> #undef swprintf
> #undef swscanf
92a82,87
> #undef vfwprintf
> #undef vfwscanf
> #undef vswprintf
> #undef vswscanf
> #undef vwprintf
> #undef vwscanf
94,99d88
< #undef wcstod
< #undef wcstof
< #undef wcstol
< #undef wcstoul
< #undef wcscpy
< #undef wcsncpy
101c90
< #undef wcsncat
---
> #undef wcschr
104,105c93
< #undef wcsncmp
< #undef wcsxfrm
---
> #undef wcscpy
106a95
> #undef wcsftime
107a97,102
> #undef wcsncat
> #undef wcsncmp
> #undef wcsncpy
> #undef wcspbrk
> #undef wcsrchr
> #undef wcsrtombs
108a104,106
> #undef wcsstr
> #undef wcstod
> #undef wcstof
109a108,112
> #undef wcstol
> #undef wcstoul
> #undef wcsxfrm
> #undef wctob
> #undef wmemchr
114,119c117,118
< #undef wcsftime
< #undef wcschr
< #undef wcspbrk
< #undef wcsrchr
< #undef wcsstr
< #undef wmemchr
---
> #undef wprintf
> #undef wscanf
127,128d125
<   using ::wctob;
< #if _GLIBCPP_HAVE_FGETWC
130,131d126
< #endif
< #if _GLIBCPP_HAVE_FGETWS
133d127
< #endif
139,148d132
<   using ::swprintf;
<   using ::swscanf;
<   using ::vfwprintf;
<   using ::vfwscanf;
<   using ::vswprintf;
<   using ::vswscanf;
<   using ::vwprintf;
<   using ::vwscanf;
<   using ::wprintf;
<   using ::wscanf;
151d134
<   using ::mbsinit;
153a137
>   using ::mbsinit;
155d138
<   using ::wcsrtombs;
157a141,142
>   using ::swprintf;
>   using ::swscanf;
158a144,149
>   using ::vfwprintf;
>   using ::vfwscanf;
>   using ::vswprintf;
>   using ::vswscanf;
>   using ::vwprintf;
>   using ::vwscanf;
160,165d150
<   using ::wcstod;
<   using ::wcstof;
<   using ::wcstol;
<   using ::wcstoul;
<   using ::wcscpy;
<   using ::wcsncpy;
167d151
<   using ::wcsncat;
170,171c154
<   using ::wcsncmp;
<   using ::wcsxfrm;
---
>   using ::wcscpy;
172a156
>   using ::wcsftime;
173a158,161
>   using ::wcsncat;
>   using ::wcsncmp;
>   using ::wcsncpy;
>   using ::wcsrtombs;
174a163,164
>   using ::wcstod;
>   using ::wcstof;
175a166,169
>   using ::wcstol;
>   using ::wcstoul;
>   using ::wcsxfrm;
>   using ::wctob;
180c174,175
<   using ::wcsftime;
---
>   using ::wprintf;
>   using ::wscanf;