Hide all reference to wchar_t so configure won't get confused

 -Erik

3 files changed, 16 insertions, 3 deletions

diff --git a/include/inttypes.h b/include/inttypes.h
index 18264e7c1..6c1553f58 100644
--- a/include/inttypes.h
+++ b/include/inttypes.h
@@ -27,6 +27,7 @@
 /* Get the type definitions.  */
 #include <stdint.h>
 
+#if 0
 /* Get a definition for wchar_t.  But we must not define wchar_t itself.  */
 #ifndef ____gwchar_t_defined
 # ifdef __cplusplus
@@ -40,6 +41,7 @@ typedef wchar_t __gwchar_t;
 # endif
 # define ____gwchar_t_defined	1
 #endif
+#endif
 
 
 /* The ISO C99 standard specifies that these macros must only be
@@ -309,6 +311,7 @@ extern intmax_t strtoimax (__const char *__restrict __nptr,
 extern uintmax_t strtoumax (__const char *__restrict __nptr,
 			    char ** __restrict __endptr, int __base) __THROW;
 
+#if 0
 /* Like `wcstol' but convert to `intmax_t'.  */
 extern intmax_t wcstoimax (__const __gwchar_t *__restrict __nptr,
 			   __gwchar_t **__restrict __endptr, int __base)
@@ -318,6 +321,7 @@ extern intmax_t wcstoimax (__const __gwchar_t *__restrict __nptr,
 extern uintmax_t wcstoumax (__const __gwchar_t *__restrict __nptr,
 			    __gwchar_t ** __restrict __endptr, int __base)
      __THROW;
+#endif
 
 #ifdef __USE_EXTERN_INLINES
 
@@ -352,6 +356,7 @@ strtoumax (__const char *__restrict nptr, char **__restrict endptr,
   return __strtoul_internal (nptr, endptr, base, 0);
 }
 
+#if 0
 /* Like `wcstol' but convert to `intmax_t'.  */
 #  ifndef __wcstol_internal_defined
 extern long int __wcstol_internal (__const __gwchar_t * __restrict __nptr,
@@ -382,6 +387,7 @@ wcstoumax (__const __gwchar_t *__restrict nptr, __gwchar_t **__restrict endptr,
 {
   return __wcstoul_internal (nptr, endptr, base, 0);
 }
+#endif
 
 # else /* __WORDSIZE == 32 */
 
@@ -418,6 +424,7 @@ strtoumax (__const char *__restrict nptr, char **__restrict endptr,
   return __strtoull_internal (nptr, endptr, base, 0);
 }
 
+#if 0
 /* Like `wcstol' but convert to `intmax_t'.  */
 #  ifndef __wcstoll_internal_defined
 __extension__
@@ -452,7 +459,7 @@ wcstoumax (__const __gwchar_t *__restrict nptr, __gwchar_t **__restrict endptr,
 {
   return __wcstoull_internal (nptr, endptr, base, 0);
 }
-
+#endif
 # endif	/* __WORDSIZE == 32	*/
 #endif	/* Use extern inlines.  */
 
diff --git a/include/stdint.h b/include/stdint.h
index 0f317684b..6da4d0d71 100644
--- a/include/stdint.h
+++ b/include/stdint.h
@@ -24,8 +24,10 @@
 #define _STDINT_H	1
 
 #include <features.h>
+#if 0
 /*#define __need_wchar_t*/
 #include <stddef.h>
+#endif
 /*#include <bits/wchar.h>*/
 #include <bits/wordsize.h>
 
@@ -270,12 +272,14 @@ typedef unsigned long long int	uintmax_t;
 #  define SIZE_MAX		(4294967295U)
 # endif
 
+#if 0
 /* Limits of `wchar_t'.  */
 # ifndef WCHAR_MIN
 /* These constants might also be defined in <wchar.h>.  */
 #  define WCHAR_MIN		__WCHAR_MIN
 #  define WCHAR_MAX		__WCHAR_MAX
 # endif
+#endif
 
 /* Limits of `wint_t'.  */
 # define WINT_MIN		(0u)
diff --git a/include/stdlib.h b/include/stdlib.h
index dbbc5c2ee..ab7baca5c 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -27,7 +27,9 @@
 /* Get size_t, wchar_t and NULL from <stddef.h>.  */
 #define		__need_size_t
 #ifndef __need_malloc_and_calloc
+#if 0
 # define	__need_wchar_t
+#endif
 # define	__need_NULL
 #endif
 #include <stddef.h>
@@ -773,7 +775,7 @@ extern int qfcvt_r (long double __value, int __ndigit,
 # endif	/* misc */
 #endif	/* use MISC || use X/Open Unix */
 
-
+#if 0
 /* Return the length of the multibyte character
    in S, which is no longer than N.  */
 extern int mblen (__const char *__s, size_t __n) __THROW;
@@ -793,7 +795,7 @@ extern size_t mbstowcs (wchar_t *__restrict  __pwcs,
 extern size_t wcstombs (char *__restrict __s,
 			__const wchar_t *__restrict __pwcs, size_t __n)
      __THROW;
-
+#endif
 
 #ifdef __USE_SVID
 /* Determine whether the string value of RESPONSE matches the affirmation