--- include/c++/cwchar.orig	Wed Mar 17 14:30:53 2004
+++ include/c++/cwchar	Wed Mar 17 14:33:12 2004
@@ -9,27 +9,12 @@
   #include <wchar.h>
  #define _STD_USING
 
-#ifndef __QNX__
-typedef mbstate_t _Mbstatet;
-#endif /* __QNX__ */
-
 #else /* _STD_USING */
  #include <wchar.h>
 
-#ifndef WCHAR_MAX
- #define WCHAR_MAX	0x7fff
-#endif /* WCHAR_MAX */
-
-#ifndef WCHAR_MIN
- #define WCHAR_MIN	0
-#endif /* WCHAR_MIN */
-
-
-typedef mbstate_t _Mbstatet;
-
  #ifdef _GLOBAL_USING
 _STD_BEGIN
-using _CSTD mbstate_t; using _CSTD size_t; using _CSTD tm; using _CSTD wint_t;
+using _CSTD mbstate_t; using _CSTD size_t; /* using _CSTD tm; */ using _CSTD wint_t;
 
 #if __GLIBC__ > 2 || __GLIBC__ == 2 && __GLIBC_MINOR__ >= 2
 using _CSTD fgetwc; using _CSTD fgetws; using _CSTD fputwc;
@@ -37,20 +22,20 @@
 using _CSTD putwc; using _CSTD putwchar; using _CSTD ungetwc;
 #endif
 
-using _CSTD btowc;
-using _CSTD mbrlen; using _CSTD mbrtowc; using _CSTD mbsrtowcs;
-using _CSTD mbsinit;
-using _CSTD wcrtomb;
-using _CSTD wcsrtombs; using _CSTD wcstol; using _CSTD wcscat;
-using _CSTD wcschr; using _CSTD wcscmp; using _CSTD wcscoll;
+// using _CSTD btowc;
+// using _CSTD mbrlen; using _CSTD mbrtowc; using _CSTD mbsrtowcs;
+// using _CSTD mbsinit;
+// using _CSTD wcrtomb;
+/* using _CSTD wcsrtombs; using _CSTD wcstol; */ using _CSTD wcscat;
+using _CSTD wcschr; using _CSTD wcscmp; // using _CSTD wcscoll;
 using _CSTD wcscpy; using _CSTD wcscspn; using _CSTD wcslen;
 using _CSTD wcsncat; using _CSTD wcsncmp; using _CSTD wcsncpy;
 using _CSTD wcspbrk; using _CSTD wcsrchr; using _CSTD wcsspn;
-using _CSTD wcstod; using _CSTD wcstoul; using _CSTD wcsstr;
-using _CSTD wcstok; using _CSTD wcsxfrm; using _CSTD wctob;
+/* using _CSTD wcstod; using _CSTD wcstoul; */ using _CSTD wcsstr;
+// using _CSTD wcstok; using _CSTD wcsxfrm; using _CSTD wctob;
 using _CSTD wmemchr; using _CSTD wmemcmp; using _CSTD wmemcpy;
 using _CSTD wmemmove; using _CSTD wmemset;
-using _CSTD wcsftime;
+// using _CSTD wcsftime;
 
 #ifdef __USE_ISOC99
 using _CSTD fwide; using _CSTD fwprintf;