diff options
| -rw-r--r-- | libc/stdio/__fsetlocking.c | 3 | ||||
| -rw-r--r-- | libc/stdio/_fpmaxtostr.c | 3 | ||||
| -rw-r--r-- | libc/stdio/_uintmaxtostr.c | 3 | ||||
| -rw-r--r-- | libc/stdio/_vfprintf.c | 10 | ||||
| -rw-r--r-- | libc/stdio/fflush.c | 1 | ||||
| -rw-r--r-- | libc/stdio/gets.c | 4 | ||||
| -rw-r--r-- | libc/stdio/perror.c | 1 | ||||
| -rw-r--r-- | libc/stdio/setbuffer.c | 3 | ||||
| -rw-r--r-- | libc/stdio/setlinebuf.c | 3 |
9 files changed, 8 insertions, 23 deletions
diff --git a/libc/stdio/__fsetlocking.c b/libc/stdio/__fsetlocking.c index 746a098f9..2e8710076 100644 --- a/libc/stdio/__fsetlocking.c +++ b/libc/stdio/__fsetlocking.c @@ -9,9 +9,6 @@ #include <stdio_ext.h> libc_hidden_proto(__fsetlocking) -#ifdef __UCLIBC_HAS_THREADS__ -libc_hidden_proto(_stdio_user_locking) -#endif /* Not threadsafe. */ diff --git a/libc/stdio/_fpmaxtostr.c b/libc/stdio/_fpmaxtostr.c index 9b87f64cf..f5632337d 100644 --- a/libc/stdio/_fpmaxtostr.c +++ b/libc/stdio/_fpmaxtostr.c @@ -12,9 +12,6 @@ #include <bits/uClibc_fpmax.h> libc_hidden_proto(memset) -#ifdef __UCLIBC_HAS_LOCALE__ -libc_hidden_proto(__global_locale) -#endif typedef size_t (__fp_outfunc_t)(FILE *fp, intptr_t type, intptr_t len, intptr_t buf); diff --git a/libc/stdio/_uintmaxtostr.c b/libc/stdio/_uintmaxtostr.c index f9c83506e..4310d6458 100644 --- a/libc/stdio/_uintmaxtostr.c +++ b/libc/stdio/_uintmaxtostr.c @@ -12,9 +12,6 @@ #include <bits/uClibc_uintmaxtostr.h> libc_hidden_proto(memcpy) -#ifdef __UCLIBC_HAS_LOCALE__ -libc_hidden_proto(__global_locale) -#endif /* Avoid using long long / and % operations to cut down dependencies on * libgcc.a. Definitely helps on i386 at least. */ diff --git a/libc/stdio/_vfprintf.c b/libc/stdio/_vfprintf.c index a32960f2e..f4bbb1c1e 100644 --- a/libc/stdio/_vfprintf.c +++ b/libc/stdio/_vfprintf.c @@ -512,10 +512,6 @@ size_t parse_printf_format(register const char *template, /**********************************************************************/ #ifdef L__ppfs_init -#ifdef __UCLIBC_HAS_LOCALE__ -libc_hidden_proto(__global_locale) -#endif - int attribute_hidden _ppfs_init(register ppfs_t *ppfs, const char *fmt0) { int r; @@ -736,7 +732,7 @@ void attribute_hidden _ppfs_setargs(register ppfs_t *ppfs) #ifdef __UCLIBC_HAS_XLOCALE__ libc_hidden_proto(__ctype_b_loc) -#else +#elif __UCLIBC_HAS_CTYPE_TABLES__ libc_hidden_proto(__ctype_b) #endif @@ -1254,10 +1250,6 @@ static size_t _fp_out_narrow(FILE *fp, intptr_t type, intptr_t len, intptr_t buf #define _outnwcs(stream, wstring, len) _wstdio_fwrite(wstring, len, stream) #define FP_OUT _fp_out_wide -#ifdef __UCLIBC_HAS_LOCALE__ -libc_hidden_proto(__global_locale) -#endif - static size_t _outnstr(FILE *stream, const char *s, size_t wclen) { /* NOTE!!! len here is the number of wchars we want to generate!!! */ diff --git a/libc/stdio/fflush.c b/libc/stdio/fflush.c index a2e1cf916..c0f58d8af 100644 --- a/libc/stdio/fflush.c +++ b/libc/stdio/fflush.c @@ -16,7 +16,6 @@ libc_hidden_proto(fflush_unlocked) #endif /* __UCLIBC_MJN3_ONLY__ */ #ifdef __UCLIBC_HAS_THREADS__ -libc_hidden_proto(_stdio_user_locking) /* Even if the stream is set to user-locking, we still need to lock * when all (lbf) writing streams are flushed. */ #define MY_STDIO_THREADLOCK(STREAM) \ diff --git a/libc/stdio/gets.c b/libc/stdio/gets.c index 5ff7869dc..dc541339b 100644 --- a/libc/stdio/gets.c +++ b/libc/stdio/gets.c @@ -13,9 +13,7 @@ link_warning(gets, "the 'gets' function is dangerous and should not be used.") libc_hidden_proto(getchar_unlocked) libc_hidden_proto(__fgetc_unlocked) -#ifdef __STDIO_GETC_MACRO -libc_hidden_proto(__stdin) -#else +#ifndef __STDIO_GETC_MACRO #define __stdin stdin #endif diff --git a/libc/stdio/perror.c b/libc/stdio/perror.c index 2c3cbbdb5..993fcf428 100644 --- a/libc/stdio/perror.c +++ b/libc/stdio/perror.c @@ -9,7 +9,6 @@ libc_hidden_proto(fprintf) libc_hidden_proto(__glibc_strerror_r) -libc_hidden_proto(stderr) #ifdef __UCLIBC_MJN3_ONLY__ #warning CONSIDER: Increase buffer size for error message (non-%m case)? diff --git a/libc/stdio/setbuffer.c b/libc/stdio/setbuffer.c index 3ca4fb7f8..ea2421aa8 100644 --- a/libc/stdio/setbuffer.c +++ b/libc/stdio/setbuffer.c @@ -7,6 +7,8 @@ #include "_stdio.h" +#ifdef __USE_BSD + libc_hidden_proto(setvbuf) /* A BSD function. The implementation matches the linux man page, @@ -21,3 +23,4 @@ void setbuffer(FILE * __restrict stream, register char * __restrict buf, setvbuf(stream, buf, (buf ? _IOFBF : _IONBF), size); #endif } +#endif diff --git a/libc/stdio/setlinebuf.c b/libc/stdio/setlinebuf.c index 29b2bdeac..9b4be53eb 100644 --- a/libc/stdio/setlinebuf.c +++ b/libc/stdio/setlinebuf.c @@ -7,6 +7,8 @@ #include "_stdio.h" +#ifdef __USE_BSD + libc_hidden_proto(setvbuf) /* A BSD function. The implementation matches the linux man page, @@ -20,3 +22,4 @@ void setlinebuf(FILE * __restrict stream) setvbuf(stream, NULL, _IOLBF, (size_t) 0); #endif } +#endif |