Browse Source

Disable some unused stuff, better guard for libc

Peter S. Mazinger 20 years ago
parent
commit
979f6e640a

+ 4 - 4
libc/sysdeps/linux/common/bits/uClibc_locale.h

@@ -78,8 +78,8 @@
 #include <bits/uClibc_locale_data.h>
 #endif
 
-extern void _locale_set(const unsigned char *p);
-extern void _locale_init(void);
+/* extern void _locale_set(const unsigned char *p); */
+/* extern void _locale_init(void); */
 
 enum {
 	__ctype_encoding_7_bit,		/* C/POSIX */
@@ -323,10 +323,10 @@ extern struct __uclibc_locale_struct * __global_locale;
 
 typedef struct __uclibc_locale_struct *__locale_t;
 
-#ifdef _LIBC
+#if defined _LIBC && defined IS_IN_libc
 extern int __locale_mbrtowc_l(wchar_t *__restrict dst,
 							  const char *__restrict src,
-							  __locale_t loc );
+							  __locale_t loc ) attribute_hidden;
 #endif
 
 #ifdef L_setlocale

+ 1 - 1
libc/sysdeps/linux/common/bits/uClibc_stdio.h

@@ -402,7 +402,7 @@ extern void __stdio_init_mutex(pthread_mutex_t *m) attribute_hidden;
 extern int __fgetc_unlocked(FILE *__stream);
 extern int __fputc_unlocked(int __c, FILE *__stream);
 
-/* First define the default definitions.  They overriden below as necessary. */
+/* First define the default definitions.  They overwritten below as necessary. */
 #define __FGETC_UNLOCKED(__stream)		(__fgetc_unlocked)((__stream))
 #define __FGETC(__stream)				(fgetc)((__stream))
 #define __GETC_UNLOCKED_MACRO(__stream)	(__fgetc_unlocked)((__stream))