From cb97aadebfeba7f5e8f1b85beee5ab10e88c2990 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Thu, 20 Nov 2008 22:11:44 +0000 Subject: Last portion of libc_hidden_proto removal. Appears to build fine (several .configs tried) --- libc/stdio/__fsetlocking.c | 2 +- libc/stdio/_cs_funcs.c | 2 +- libc/stdio/_flushlbf.c | 2 +- libc/stdio/_fopen.c | 2 +- libc/stdio/_scanf.c | 34 +++++++++++++++++----------------- libc/stdio/_stdio.c | 2 +- libc/stdio/_trans2w.c | 2 +- libc/stdio/_vfprintf.c | 18 +++++++++--------- libc/stdio/_wfwrite.c | 4 ++-- libc/stdio/asprintf.c | 4 ++-- libc/stdio/dprintf.c | 2 +- libc/stdio/fclose.c | 2 +- libc/stdio/fdopen.c | 2 +- libc/stdio/fflush.c | 6 +++--- libc/stdio/fgetc.c | 12 ++++++------ libc/stdio/fgets.c | 4 ++-- libc/stdio/fgetwc.c | 8 ++++---- libc/stdio/fgetws.c | 4 ++-- libc/stdio/fileno.c | 6 +++--- libc/stdio/fmemopen.c | 2 +- libc/stdio/fopencookie.c | 2 +- libc/stdio/fputc.c | 12 ++++++------ libc/stdio/fputs.c | 4 ++-- libc/stdio/fputwc.c | 2 +- libc/stdio/fputws.c | 8 ++++---- libc/stdio/fread.c | 8 ++++---- libc/stdio/fseeko.c | 4 ++-- libc/stdio/ftello.c | 4 ++-- libc/stdio/fwprintf.c | 2 +- libc/stdio/fwrite.c | 6 +++--- libc/stdio/getchar.c | 4 ++-- libc/stdio/getdelim.c | 4 ++-- libc/stdio/getline.c | 4 ++-- libc/stdio/gets.c | 2 +- libc/stdio/getw.c | 2 +- libc/stdio/getwchar.c | 4 ++-- libc/stdio/old_vfprintf.c | 6 +++--- libc/stdio/open_memstream.c | 4 ++-- libc/stdio/perror.c | 2 +- libc/stdio/popen.c | 14 +++++++------- libc/stdio/putchar.c | 2 +- libc/stdio/puts.c | 4 ++-- libc/stdio/putw.c | 2 +- libc/stdio/putwchar.c | 6 +++--- libc/stdio/remove.c | 6 +++--- libc/stdio/rewind.c | 4 ++-- libc/stdio/setbuf.c | 2 +- libc/stdio/setbuffer.c | 2 +- libc/stdio/setlinebuf.c | 2 +- libc/stdio/setvbuf.c | 2 +- libc/stdio/snprintf.c | 4 ++-- libc/stdio/sprintf.c | 2 +- libc/stdio/swprintf.c | 2 +- libc/stdio/tmpfile.c | 4 ++-- libc/stdio/ungetc.c | 2 +- libc/stdio/ungetwc.c | 2 +- libc/stdio/vasprintf.c | 6 +++--- libc/stdio/vdprintf.c | 4 ++-- libc/stdio/vsnprintf.c | 2 +- libc/stdio/vsprintf.c | 2 +- libc/stdio/vswprintf.c | 2 +- libc/stdio/vwprintf.c | 2 +- libc/stdio/wprintf.c | 2 +- 63 files changed, 143 insertions(+), 143 deletions(-) (limited to 'libc/stdio') diff --git a/libc/stdio/__fsetlocking.c b/libc/stdio/__fsetlocking.c index 2e8710076..2011cc78c 100644 --- a/libc/stdio/__fsetlocking.c +++ b/libc/stdio/__fsetlocking.c @@ -8,7 +8,7 @@ #include "_stdio.h" #include -libc_hidden_proto(__fsetlocking) +/* libc_hidden_proto(__fsetlocking) */ /* Not threadsafe. */ diff --git a/libc/stdio/_cs_funcs.c b/libc/stdio/_cs_funcs.c index 3cca7b9af..69a04bcc8 100644 --- a/libc/stdio/_cs_funcs.c +++ b/libc/stdio/_cs_funcs.c @@ -11,7 +11,7 @@ /* libc_hidden_proto(write) */ /* libc_hidden_proto(close) */ #ifdef __UCLIBC_HAS_LFS__ -libc_hidden_proto(lseek64) +/* libc_hidden_proto(lseek64) */ #else /* libc_hidden_proto(lseek) */ #endif diff --git a/libc/stdio/_flushlbf.c b/libc/stdio/_flushlbf.c index 8a551a746..7146e9bc9 100644 --- a/libc/stdio/_flushlbf.c +++ b/libc/stdio/_flushlbf.c @@ -8,7 +8,7 @@ #include "_stdio.h" #include -libc_hidden_proto(fflush_unlocked) +/* libc_hidden_proto(fflush_unlocked) */ /* Solaris function -- * Flush all line buffered (writing) streams. diff --git a/libc/stdio/_fopen.c b/libc/stdio/_fopen.c index d3240b77b..fcbe1e4c6 100644 --- a/libc/stdio/_fopen.c +++ b/libc/stdio/_fopen.c @@ -7,7 +7,7 @@ #include "_stdio.h" -libc_hidden_proto(isatty) +/* libc_hidden_proto(isatty) */ /* libc_hidden_proto(open) */ /* libc_hidden_proto(fcntl) */ diff --git a/libc/stdio/_scanf.c b/libc/stdio/_scanf.c index 5b9e7008a..1a42ffbfd 100644 --- a/libc/stdio/_scanf.c +++ b/libc/stdio/_scanf.c @@ -81,22 +81,22 @@ /* Experimentally off - libc_hidden_proto(memset) */ /* Experimentally off - libc_hidden_proto(strcpy) */ /* Experimentally off - libc_hidden_proto(strlen) */ -libc_hidden_proto(ungetc) -libc_hidden_proto(vfscanf) -libc_hidden_proto(vsscanf) +/* libc_hidden_proto(ungetc) */ +/* libc_hidden_proto(vfscanf) */ +/* libc_hidden_proto(vsscanf) */ /* libc_hidden_proto(fclose) */ -libc_hidden_proto(getc_unlocked) -libc_hidden_proto(__fgetc_unlocked) +/* libc_hidden_proto(getc_unlocked) */ +/* libc_hidden_proto(__fgetc_unlocked) */ #ifdef __UCLIBC_HAS_WCHAR__ -libc_hidden_proto(wcslen) -libc_hidden_proto(vfwscanf) -libc_hidden_proto(vswscanf) -libc_hidden_proto(mbsrtowcs) -libc_hidden_proto(mbrtowc) -libc_hidden_proto(wcrtomb) -libc_hidden_proto(ungetwc) -libc_hidden_proto(iswspace) -libc_hidden_proto(fgetwc_unlocked) +/* libc_hidden_proto(wcslen) */ +/* libc_hidden_proto(vfwscanf) */ +/* libc_hidden_proto(vswscanf) */ +/* libc_hidden_proto(mbsrtowcs) */ +/* libc_hidden_proto(mbrtowc) */ +/* libc_hidden_proto(wcrtomb) */ +/* libc_hidden_proto(ungetwc) */ +/* libc_hidden_proto(iswspace) */ +/* libc_hidden_proto(fgetwc_unlocked) */ #endif #ifdef __UCLIBC_HAS_XLOCALE__ /* libc_hidden_proto(__ctype_b_loc) */ @@ -165,7 +165,7 @@ _stdlib_strto_l(register const char * __restrict str, /**********************************************************************/ #ifdef L_fscanf -libc_hidden_proto(fscanf) +/* libc_hidden_proto(fscanf) */ int fscanf(FILE * __restrict stream, const char * __restrict format, ...) { va_list arg; @@ -201,7 +201,7 @@ int scanf(const char * __restrict format, ...) #ifdef __STDIO_HAS_VSSCANF -libc_hidden_proto(sscanf) +/* libc_hidden_proto(sscanf) */ int sscanf(const char * __restrict str, const char * __restrict format, ...) { va_list arg; @@ -223,7 +223,7 @@ libc_hidden_def(sscanf) /**********************************************************************/ #ifdef L_vscanf -libc_hidden_proto(vscanf) +/* libc_hidden_proto(vscanf) */ int vscanf(const char * __restrict format, va_list arg) { return vfscanf(stdin, format, arg); diff --git a/libc/stdio/_stdio.c b/libc/stdio/_stdio.c index d8c0ae20d..52e7295cf 100644 --- a/libc/stdio/_stdio.c +++ b/libc/stdio/_stdio.c @@ -8,7 +8,7 @@ #include "_stdio.h" /* Experimentally off - libc_hidden_proto(memcpy) */ -libc_hidden_proto(isatty) +/* libc_hidden_proto(isatty) */ /* This is pretty much straight from uClibc, but with one important * difference. diff --git a/libc/stdio/_trans2w.c b/libc/stdio/_trans2w.c index ed1a583fc..57a06d336 100644 --- a/libc/stdio/_trans2w.c +++ b/libc/stdio/_trans2w.c @@ -7,7 +7,7 @@ #include "_stdio.h" -libc_hidden_proto(fseek) +/* libc_hidden_proto(fseek) */ /* Function to handle transition to writing. * Initialize or verify the stream's orientation (even if readonly). diff --git a/libc/stdio/_vfprintf.c b/libc/stdio/_vfprintf.c index 9d7f99cad..5ce3f8a59 100644 --- a/libc/stdio/_vfprintf.c +++ b/libc/stdio/_vfprintf.c @@ -119,17 +119,17 @@ /* Experimentally off - libc_hidden_proto(memset) */ /* Experimentally off - libc_hidden_proto(strlen) */ /* Experimentally off - libc_hidden_proto(strnlen) */ -libc_hidden_proto(__glibc_strerror_r) -libc_hidden_proto(fputs_unlocked) +/* libc_hidden_proto(__glibc_strerror_r) */ +/* libc_hidden_proto(fputs_unlocked) */ /* libc_hidden_proto(abort) */ #ifdef __UCLIBC_HAS_WCHAR__ -libc_hidden_proto(wcslen) -libc_hidden_proto(wcsnlen) -libc_hidden_proto(mbsrtowcs) -libc_hidden_proto(wcsrtombs) -libc_hidden_proto(btowc) -libc_hidden_proto(wcrtomb) -libc_hidden_proto(fputws) +/* libc_hidden_proto(wcslen) */ +/* libc_hidden_proto(wcsnlen) */ +/* libc_hidden_proto(mbsrtowcs) */ +/* libc_hidden_proto(wcsrtombs) */ +/* libc_hidden_proto(btowc) */ +/* libc_hidden_proto(wcrtomb) */ +/* libc_hidden_proto(fputws) */ #endif /* Some older or broken gcc toolchains define LONG_LONG_MAX but not diff --git a/libc/stdio/_wfwrite.c b/libc/stdio/_wfwrite.c index fb5c6b3ee..8fa59f87d 100644 --- a/libc/stdio/_wfwrite.c +++ b/libc/stdio/_wfwrite.c @@ -16,8 +16,8 @@ #warning TODO: Fix prototype. #endif -libc_hidden_proto(wmemcpy) -libc_hidden_proto(wcsnrtombs) +/* libc_hidden_proto(wmemcpy) */ +/* libc_hidden_proto(wcsnrtombs) */ size_t attribute_hidden _wstdio_fwrite(const wchar_t *__restrict ws, size_t n, register FILE *__restrict stream) diff --git a/libc/stdio/asprintf.c b/libc/stdio/asprintf.c index 3f1992559..8c6420936 100644 --- a/libc/stdio/asprintf.c +++ b/libc/stdio/asprintf.c @@ -11,9 +11,9 @@ #include "_stdio.h" #include -libc_hidden_proto(asprintf) +/* libc_hidden_proto(asprintf) */ -libc_hidden_proto(vasprintf) +/* libc_hidden_proto(vasprintf) */ #ifndef __STDIO_HAS_VSNPRINTF #warning Skipping asprintf and __asprintf since no vsnprintf! diff --git a/libc/stdio/dprintf.c b/libc/stdio/dprintf.c index a8b2704b2..0123c501a 100644 --- a/libc/stdio/dprintf.c +++ b/libc/stdio/dprintf.c @@ -11,7 +11,7 @@ #include "_stdio.h" #include -libc_hidden_proto(vdprintf) +/* libc_hidden_proto(vdprintf) */ int dprintf(int filedes, const char * __restrict format, ...) { diff --git a/libc/stdio/fclose.c b/libc/stdio/fclose.c index eadfe74de..7d2138130 100644 --- a/libc/stdio/fclose.c +++ b/libc/stdio/fclose.c @@ -9,7 +9,7 @@ /* libc_hidden_proto(fclose) */ /* libc_hidden_proto(close) */ -libc_hidden_proto(fflush_unlocked) +/* libc_hidden_proto(fflush_unlocked) */ int fclose(register FILE *stream) { diff --git a/libc/stdio/fdopen.c b/libc/stdio/fdopen.c index fcd21f707..d47d6ea99 100644 --- a/libc/stdio/fdopen.c +++ b/libc/stdio/fdopen.c @@ -7,7 +7,7 @@ #include "_stdio.h" -libc_hidden_proto(fdopen) +/* libc_hidden_proto(fdopen) */ /* libc_hidden_proto(fcntl) */ FILE *fdopen(int filedes, const char *mode) diff --git a/libc/stdio/fflush.c b/libc/stdio/fflush.c index e1527b3a3..cee712a92 100644 --- a/libc/stdio/fflush.c +++ b/libc/stdio/fflush.c @@ -7,7 +7,7 @@ #include "_stdio.h" -libc_hidden_proto(fflush_unlocked) +/* libc_hidden_proto(fflush_unlocked) */ #ifdef __DO_UNLOCKED @@ -179,14 +179,14 @@ int fflush_unlocked(register FILE *stream) libc_hidden_def(fflush_unlocked) #ifndef __UCLIBC_HAS_THREADS__ -libc_hidden_proto(fflush) +/* libc_hidden_proto(fflush) */ strong_alias(fflush_unlocked,fflush) libc_hidden_def(fflush) #endif #elif defined __UCLIBC_HAS_THREADS__ -libc_hidden_proto(fflush) +/* libc_hidden_proto(fflush) */ int fflush(register FILE *stream) { int retval; diff --git a/libc/stdio/fgetc.c b/libc/stdio/fgetc.c index 7eb2b6ea2..89c8fe35a 100644 --- a/libc/stdio/fgetc.c +++ b/libc/stdio/fgetc.c @@ -13,11 +13,11 @@ #undef getc #undef getc_unlocked -libc_hidden_proto(__fgetc_unlocked) +/* libc_hidden_proto(__fgetc_unlocked) */ #ifdef __DO_UNLOCKED -libc_hidden_proto(fflush_unlocked) +/* libc_hidden_proto(fflush_unlocked) */ int __fgetc_unlocked(FILE *stream) { @@ -75,7 +75,7 @@ int __fgetc_unlocked(FILE *stream) } libc_hidden_def(__fgetc_unlocked) -libc_hidden_proto(fgetc_unlocked) +/* libc_hidden_proto(fgetc_unlocked) */ strong_alias(__fgetc_unlocked,fgetc_unlocked) libc_hidden_def(fgetc_unlocked) @@ -83,12 +83,12 @@ libc_hidden_def(fgetc_unlocked) //strong_alias(__fgetc_unlocked,__getc_unlocked) //libc_hidden_def(__getc_unlocked) -libc_hidden_proto(getc_unlocked) +/* libc_hidden_proto(getc_unlocked) */ strong_alias(__fgetc_unlocked,getc_unlocked) libc_hidden_def(getc_unlocked) #ifndef __UCLIBC_HAS_THREADS__ -libc_hidden_proto(fgetc) +/* libc_hidden_proto(fgetc) */ strong_alias(__fgetc_unlocked,fgetc) libc_hidden_def(fgetc) @@ -97,7 +97,7 @@ strong_alias(__fgetc_unlocked,getc) #elif defined __UCLIBC_HAS_THREADS__ -libc_hidden_proto(fgetc) +/* libc_hidden_proto(fgetc) */ int fgetc(register FILE *stream) { if (stream->__user_locking != 0) { diff --git a/libc/stdio/fgets.c b/libc/stdio/fgets.c index 5eb1aac31..0c7b97ecd 100644 --- a/libc/stdio/fgets.c +++ b/libc/stdio/fgets.c @@ -7,11 +7,11 @@ #include "_stdio.h" -libc_hidden_proto(fgets_unlocked) +/* libc_hidden_proto(fgets_unlocked) */ #ifdef __DO_UNLOCKED -libc_hidden_proto(__fgetc_unlocked) +/* libc_hidden_proto(__fgetc_unlocked) */ char *fgets_unlocked(char *__restrict s, int n, register FILE * __restrict stream) diff --git a/libc/stdio/fgetwc.c b/libc/stdio/fgetwc.c index 062d825d6..34327434c 100644 --- a/libc/stdio/fgetwc.c +++ b/libc/stdio/fgetwc.c @@ -7,9 +7,9 @@ #include "_stdio.h" -libc_hidden_proto(fgetwc_unlocked) +/* libc_hidden_proto(fgetwc_unlocked) */ -libc_hidden_proto(mbrtowc) +/* libc_hidden_proto(mbrtowc) */ #ifdef __DO_UNLOCKED @@ -113,7 +113,7 @@ libc_hidden_def(fgetwc_unlocked) strong_alias(fgetwc_unlocked,getwc_unlocked) #ifndef __UCLIBC_HAS_THREADS__ -libc_hidden_proto(fgetwc) +/* libc_hidden_proto(fgetwc) */ strong_alias(fgetwc_unlocked,fgetwc) libc_hidden_def(fgetwc) @@ -122,7 +122,7 @@ strong_alias(fgetwc_unlocked,getwc) #elif defined __UCLIBC_HAS_THREADS__ -libc_hidden_proto(fgetwc) +/* libc_hidden_proto(fgetwc) */ wint_t fgetwc(register FILE *stream) { wint_t retval; diff --git a/libc/stdio/fgetws.c b/libc/stdio/fgetws.c index c7dcc7d2b..80af1a217 100644 --- a/libc/stdio/fgetws.c +++ b/libc/stdio/fgetws.c @@ -7,9 +7,9 @@ #include "_stdio.h" -libc_hidden_proto(fgetws_unlocked) +/* libc_hidden_proto(fgetws_unlocked) */ -libc_hidden_proto(fgetwc_unlocked) +/* libc_hidden_proto(fgetwc_unlocked) */ #ifdef __DO_UNLOCKED diff --git a/libc/stdio/fileno.c b/libc/stdio/fileno.c index 929936bfd..faed620d8 100644 --- a/libc/stdio/fileno.c +++ b/libc/stdio/fileno.c @@ -7,7 +7,7 @@ #include "_stdio.h" -libc_hidden_proto(fileno_unlocked) +/* libc_hidden_proto(fileno_unlocked) */ #ifdef __DO_UNLOCKED @@ -25,14 +25,14 @@ int fileno_unlocked(register FILE *stream) libc_hidden_def(fileno_unlocked) #ifndef __UCLIBC_HAS_THREADS__ -libc_hidden_proto(fileno) +/* libc_hidden_proto(fileno) */ strong_alias(fileno_unlocked,fileno) libc_hidden_def(fileno) #endif #elif defined __UCLIBC_HAS_THREADS__ -libc_hidden_proto(fileno) +/* libc_hidden_proto(fileno) */ int fileno(register FILE *stream) { int retval; diff --git a/libc/stdio/fmemopen.c b/libc/stdio/fmemopen.c index ba194d726..269c7ec6d 100644 --- a/libc/stdio/fmemopen.c +++ b/libc/stdio/fmemopen.c @@ -11,7 +11,7 @@ #include "_stdio.h" /* Experimentally off - libc_hidden_proto(memcpy) */ -libc_hidden_proto(fopencookie) +/* libc_hidden_proto(fopencookie) */ #ifndef __UCLIBC_HAS_GLIBC_CUSTOM_STREAMS__ #error no custom streams! diff --git a/libc/stdio/fopencookie.c b/libc/stdio/fopencookie.c index 0b7ed84b1..ac2c33483 100644 --- a/libc/stdio/fopencookie.c +++ b/libc/stdio/fopencookie.c @@ -31,7 +31,7 @@ /* Currently no real reentrancy issues other than a possible double close(). */ #ifndef __BCC__ -libc_hidden_proto(fopencookie) +/* libc_hidden_proto(fopencookie) */ FILE *fopencookie(void * __restrict cookie, const char * __restrict mode, cookie_io_functions_t io_functions) #else diff --git a/libc/stdio/fputc.c b/libc/stdio/fputc.c index ac3b23ec5..09d8ee138 100644 --- a/libc/stdio/fputc.c +++ b/libc/stdio/fputc.c @@ -12,7 +12,7 @@ #undef putc #undef putc_unlocked -libc_hidden_proto(__fputc_unlocked) +/* libc_hidden_proto(__fputc_unlocked) */ #ifdef __DO_UNLOCKED @@ -78,22 +78,22 @@ strong_alias(__fputc_unlocked,fputc_unlocked) /* exposing these would be fundamentally *wrong*! fix you, instead! */ /* libc_hidden_def(fputc_unlocked) */ -libc_hidden_proto(putc_unlocked) +/* libc_hidden_proto(putc_unlocked) */ strong_alias(__fputc_unlocked,putc_unlocked) libc_hidden_def(putc_unlocked) #ifndef __UCLIBC_HAS_THREADS__ -libc_hidden_proto(fputc) +/* libc_hidden_proto(fputc) */ strong_alias(__fputc_unlocked,fputc) libc_hidden_def(fputc) -libc_hidden_proto(putc) +/* libc_hidden_proto(putc) */ strong_alias(__fputc_unlocked,putc) libc_hidden_def(putc) #endif #elif defined __UCLIBC_HAS_THREADS__ -libc_hidden_proto(fputc) +/* libc_hidden_proto(fputc) */ int fputc(int c, register FILE *stream) { if (stream->__user_locking != 0) { @@ -108,7 +108,7 @@ int fputc(int c, register FILE *stream) } libc_hidden_def(fputc) -libc_hidden_proto(putc) +/* libc_hidden_proto(putc) */ strong_alias(fputc,putc) libc_hidden_def(putc) diff --git a/libc/stdio/fputs.c b/libc/stdio/fputs.c index 553fb2eb9..08da59c40 100644 --- a/libc/stdio/fputs.c +++ b/libc/stdio/fputs.c @@ -7,10 +7,10 @@ #include "_stdio.h" -libc_hidden_proto(fputs_unlocked) +/* libc_hidden_proto(fputs_unlocked) */ /* Experimentally off - libc_hidden_proto(strlen) */ -libc_hidden_proto(fwrite_unlocked) +/* libc_hidden_proto(fwrite_unlocked) */ /* Note: The standard says fputs returns a nonnegative number on * success. In this implementation, we return the length of the diff --git a/libc/stdio/fputwc.c b/libc/stdio/fputwc.c index 240c1e9c4..6c7d6b263 100644 --- a/libc/stdio/fputwc.c +++ b/libc/stdio/fputwc.c @@ -7,7 +7,7 @@ #include "_stdio.h" -libc_hidden_proto(fputwc_unlocked) +/* libc_hidden_proto(fputwc_unlocked) */ #ifdef __DO_UNLOCKED diff --git a/libc/stdio/fputws.c b/libc/stdio/fputws.c index ecbc121dd..a4fadb428 100644 --- a/libc/stdio/fputws.c +++ b/libc/stdio/fputws.c @@ -7,9 +7,9 @@ #include "_stdio.h" -libc_hidden_proto(fputws_unlocked) +/* libc_hidden_proto(fputws_unlocked) */ -libc_hidden_proto(wcslen) +/* libc_hidden_proto(wcslen) */ #ifdef __DO_UNLOCKED @@ -23,14 +23,14 @@ int fputws_unlocked(const wchar_t *__restrict ws, libc_hidden_def(fputws_unlocked) #ifndef __UCLIBC_HAS_THREADS__ -libc_hidden_proto(fputws) +/* libc_hidden_proto(fputws) */ strong_alias(fputws_unlocked,fputws) libc_hidden_def(fputws) #endif #elif defined __UCLIBC_HAS_THREADS__ -libc_hidden_proto(fputws) +/* libc_hidden_proto(fputws) */ int fputws(const wchar_t *__restrict ws, register FILE *__restrict stream) { int retval; diff --git a/libc/stdio/fread.c b/libc/stdio/fread.c index 4f9c98465..55d3cb2d3 100644 --- a/libc/stdio/fread.c +++ b/libc/stdio/fread.c @@ -7,12 +7,12 @@ #include "_stdio.h" -libc_hidden_proto(fread_unlocked) +/* libc_hidden_proto(fread_unlocked) */ #ifdef __DO_UNLOCKED /* Experimentally off - libc_hidden_proto(memcpy) */ -libc_hidden_proto(fflush_unlocked) +/* libc_hidden_proto(fflush_unlocked) */ size_t fread_unlocked(void * __restrict ptr, size_t size, size_t nmemb, FILE * __restrict stream) @@ -90,14 +90,14 @@ size_t fread_unlocked(void * __restrict ptr, size_t size, size_t nmemb, libc_hidden_def(fread_unlocked) #ifndef __UCLIBC_HAS_THREADS__ -libc_hidden_proto(fread) +/* libc_hidden_proto(fread) */ strong_alias(fread_unlocked,fread) libc_hidden_def(fread) #endif #elif defined __UCLIBC_HAS_THREADS__ -libc_hidden_proto(fread) +/* libc_hidden_proto(fread) */ size_t fread(void * __restrict ptr, size_t size, size_t nmemb, register FILE * __restrict stream) { diff --git a/libc/stdio/fseeko.c b/libc/stdio/fseeko.c index 251040231..a7f8b8dc1 100644 --- a/libc/stdio/fseeko.c +++ b/libc/stdio/fseeko.c @@ -17,9 +17,9 @@ #endif #ifdef __UCLIBC_HAS_LFS__ -libc_hidden_proto(fseeko64) +/* libc_hidden_proto(fseeko64) */ #endif -libc_hidden_proto(fseek) +/* libc_hidden_proto(fseek) */ int FSEEK(register FILE *stream, OFFSET_TYPE offset, int whence) { diff --git a/libc/stdio/ftello.c b/libc/stdio/ftello.c index bae1d877c..f6adf3874 100644 --- a/libc/stdio/ftello.c +++ b/libc/stdio/ftello.c @@ -8,9 +8,9 @@ #include "_stdio.h" #ifdef __UCLIBC_HAS_LFS__ -libc_hidden_proto(ftello64) +/* libc_hidden_proto(ftello64) */ #endif -libc_hidden_proto(ftell) +/* libc_hidden_proto(ftell) */ #ifndef __DO_LARGEFILE # define FTELL ftell diff --git a/libc/stdio/fwprintf.c b/libc/stdio/fwprintf.c index f2a1afbec..a5f09cd2d 100644 --- a/libc/stdio/fwprintf.c +++ b/libc/stdio/fwprintf.c @@ -9,7 +9,7 @@ #include #include -libc_hidden_proto(vfwprintf) +/* libc_hidden_proto(vfwprintf) */ int fwprintf(FILE * __restrict stream, const wchar_t * __restrict format, ...) { diff --git a/libc/stdio/fwrite.c b/libc/stdio/fwrite.c index 7be794ab4..180fa9249 100644 --- a/libc/stdio/fwrite.c +++ b/libc/stdio/fwrite.c @@ -7,7 +7,7 @@ #include "_stdio.h" -libc_hidden_proto(fwrite_unlocked) +/* libc_hidden_proto(fwrite_unlocked) */ #ifdef __DO_UNLOCKED @@ -38,14 +38,14 @@ size_t fwrite_unlocked(const void * __restrict ptr, size_t size, libc_hidden_def(fwrite_unlocked) #ifndef __UCLIBC_HAS_THREADS__ -libc_hidden_proto(fwrite) +/* libc_hidden_proto(fwrite) */ strong_alias(fwrite_unlocked,fwrite) libc_hidden_def(fwrite) #endif #elif defined __UCLIBC_HAS_THREADS__ -libc_hidden_proto(fwrite) +/* libc_hidden_proto(fwrite) */ size_t fwrite(const void * __restrict ptr, size_t size, size_t nmemb, register FILE * __restrict stream) { diff --git a/libc/stdio/getchar.c b/libc/stdio/getchar.c index e29c426c8..2ef7220e4 100644 --- a/libc/stdio/getchar.c +++ b/libc/stdio/getchar.c @@ -7,14 +7,14 @@ #include "_stdio.h" -libc_hidden_proto(__fgetc_unlocked) +/* libc_hidden_proto(__fgetc_unlocked) */ #undef getchar #ifdef __DO_UNLOCKED /* the only use of the hidden getchar_unlocked is in gets.c */ #undef getchar_unlocked -libc_hidden_proto(getchar_unlocked) +/* libc_hidden_proto(getchar_unlocked) */ int getchar_unlocked(void) { register FILE *stream = stdin; diff --git a/libc/stdio/getdelim.c b/libc/stdio/getdelim.c index 21c86f400..30fca81d7 100644 --- a/libc/stdio/getdelim.c +++ b/libc/stdio/getdelim.c @@ -10,9 +10,9 @@ #ifdef __USE_GNU #include "_stdio.h" -libc_hidden_proto(getdelim) +/* libc_hidden_proto(getdelim) */ -libc_hidden_proto(__fgetc_unlocked) +/* libc_hidden_proto(__fgetc_unlocked) */ /* Note: There is a defect in this function. (size_t vs ssize_t). */ diff --git a/libc/stdio/getline.c b/libc/stdio/getline.c index 22b67b831..8123b0c95 100644 --- a/libc/stdio/getline.c +++ b/libc/stdio/getline.c @@ -10,9 +10,9 @@ #ifdef __USE_GNU #include "_stdio.h" -libc_hidden_proto(getline) +/* libc_hidden_proto(getline) */ -libc_hidden_proto(getdelim) +/* libc_hidden_proto(getdelim) */ ssize_t getline(char **__restrict lineptr, size_t *__restrict n, FILE *__restrict stream) diff --git a/libc/stdio/gets.c b/libc/stdio/gets.c index 85bb8475a..c8271977e 100644 --- a/libc/stdio/gets.c +++ b/libc/stdio/gets.c @@ -13,7 +13,7 @@ link_warning(gets, "the 'gets' function is dangerous and should not be used.") /* disable macro, force actual function call */ #undef getchar_unlocked -libc_hidden_proto(getchar_unlocked) +/* libc_hidden_proto(getchar_unlocked) */ char *gets(char *s) { diff --git a/libc/stdio/getw.c b/libc/stdio/getw.c index e3aeda92c..75255aae9 100644 --- a/libc/stdio/getw.c +++ b/libc/stdio/getw.c @@ -7,7 +7,7 @@ #include "_stdio.h" -libc_hidden_proto(fread_unlocked) +/* libc_hidden_proto(fread_unlocked) */ /* SUSv2 Legacy function -- need not be reentrant. */ diff --git a/libc/stdio/getwchar.c b/libc/stdio/getwchar.c index 9c480b564..c17f0c71c 100644 --- a/libc/stdio/getwchar.c +++ b/libc/stdio/getwchar.c @@ -9,7 +9,7 @@ #ifdef __DO_UNLOCKED -libc_hidden_proto(fgetwc_unlocked) +/* libc_hidden_proto(fgetwc_unlocked) */ wint_t getwchar_unlocked(void) { @@ -22,7 +22,7 @@ strong_alias(getwchar_unlocked,getwchar) #elif defined __UCLIBC_HAS_THREADS__ -libc_hidden_proto(fgetwc) +/* libc_hidden_proto(fgetwc) */ wint_t getwchar(void) { diff --git a/libc/stdio/old_vfprintf.c b/libc/stdio/old_vfprintf.c index 17969a4fa..e3a817368 100644 --- a/libc/stdio/old_vfprintf.c +++ b/libc/stdio/old_vfprintf.c @@ -146,9 +146,9 @@ /* Experimentally off - libc_hidden_proto(strlen) */ /* Experimentally off - libc_hidden_proto(strnlen) */ /* Experimentally off - libc_hidden_proto(memcpy) */ -libc_hidden_proto(putc_unlocked) -libc_hidden_proto(__fputc_unlocked) -libc_hidden_proto(__glibc_strerror_r) +/* libc_hidden_proto(putc_unlocked) */ +/* libc_hidden_proto(__fputc_unlocked) */ +/* libc_hidden_proto(__glibc_strerror_r) */ /* #undef __UCLIBC_HAS_FLOATS__ */ /* #undef WANT_FLOAT_ERROR */ diff --git a/libc/stdio/open_memstream.c b/libc/stdio/open_memstream.c index 5861017e4..46142a089 100644 --- a/libc/stdio/open_memstream.c +++ b/libc/stdio/open_memstream.c @@ -12,7 +12,7 @@ /* Experimentally off - libc_hidden_proto(memcpy) */ /* Experimentally off - libc_hidden_proto(memset) */ -libc_hidden_proto(fopencookie) +/* libc_hidden_proto(fopencookie) */ #ifndef __UCLIBC_HAS_GLIBC_CUSTOM_STREAMS__ #error no custom streams! @@ -131,7 +131,7 @@ static const cookie_io_functions_t _oms_io_funcs = { * (ie replace the FILE buffer with the cookie buffer and update FILE bufstart, * etc. whenever we seek). */ -libc_hidden_proto(open_memstream) +/* libc_hidden_proto(open_memstream) */ FILE *open_memstream(char **__restrict bufloc, size_t *__restrict sizeloc) { register __oms_cookie *cookie; diff --git a/libc/stdio/perror.c b/libc/stdio/perror.c index 0f63c40bf..a01c4fe18 100644 --- a/libc/stdio/perror.c +++ b/libc/stdio/perror.c @@ -8,7 +8,7 @@ #include "_stdio.h" /* libc_hidden_proto(fprintf) */ -libc_hidden_proto(__glibc_strerror_r) +/* libc_hidden_proto(__glibc_strerror_r) */ #ifdef __UCLIBC_MJN3_ONLY__ #warning CONSIDER: Increase buffer size for error message (non-%m case)? diff --git a/libc/stdio/popen.c b/libc/stdio/popen.c index 21b1231ea..e920b8d7e 100644 --- a/libc/stdio/popen.c +++ b/libc/stdio/popen.c @@ -28,12 +28,12 @@ /* libc_hidden_proto(close) */ /* libc_hidden_proto(_exit) */ -libc_hidden_proto(waitpid) -libc_hidden_proto(execl) -libc_hidden_proto(dup2) -libc_hidden_proto(fdopen) -libc_hidden_proto(pipe) -libc_hidden_proto(vfork) +/* libc_hidden_proto(waitpid) */ +/* libc_hidden_proto(execl) */ +/* libc_hidden_proto(dup2) */ +/* libc_hidden_proto(fdopen) */ +/* libc_hidden_proto(pipe) */ +/* libc_hidden_proto(vfork) */ /* libc_hidden_proto(fclose) */ /* uClinux-2.0 has vfork, but Linux 2.0 doesn't */ @@ -42,7 +42,7 @@ libc_hidden_proto(vfork) # define vfork fork # define VFORK_LOCK ((void) 0) # define VFORK_UNLOCK ((void) 0) -libc_hidden_proto(fork) +/* libc_hidden_proto(fork) */ #endif #ifndef VFORK_LOCK diff --git a/libc/stdio/putchar.c b/libc/stdio/putchar.c index b54a7a815..65d8f64c1 100644 --- a/libc/stdio/putchar.c +++ b/libc/stdio/putchar.c @@ -7,7 +7,7 @@ #include "_stdio.h" -libc_hidden_proto(__fputc_unlocked) +/* libc_hidden_proto(__fputc_unlocked) */ #undef putchar #ifdef __DO_UNLOCKED diff --git a/libc/stdio/puts.c b/libc/stdio/puts.c index 08525b2f6..3ece1ba68 100644 --- a/libc/stdio/puts.c +++ b/libc/stdio/puts.c @@ -7,8 +7,8 @@ #include "_stdio.h" -libc_hidden_proto(__fputc_unlocked) -libc_hidden_proto(fputs_unlocked) +/* libc_hidden_proto(__fputc_unlocked) */ +/* libc_hidden_proto(fputs_unlocked) */ int puts(register const char * __restrict s) { diff --git a/libc/stdio/putw.c b/libc/stdio/putw.c index 469e44aea..5074117b6 100644 --- a/libc/stdio/putw.c +++ b/libc/stdio/putw.c @@ -7,7 +7,7 @@ #include "_stdio.h" -libc_hidden_proto(fwrite_unlocked) +/* libc_hidden_proto(fwrite_unlocked) */ /* SUSv2 Legacy function -- need not be reentrant. */ diff --git a/libc/stdio/putwchar.c b/libc/stdio/putwchar.c index 7a6501c28..aa6531988 100644 --- a/libc/stdio/putwchar.c +++ b/libc/stdio/putwchar.c @@ -9,7 +9,7 @@ #ifdef __DO_UNLOCKED -libc_hidden_proto(fputwc_unlocked) +/* libc_hidden_proto(fputwc_unlocked) */ wint_t putwchar_unlocked(wchar_t wc) { @@ -22,9 +22,9 @@ strong_alias(putwchar_unlocked,putwchar) #elif defined __UCLIBC_HAS_THREADS__ -libc_hidden_proto(__fputc_unlocked) +/* libc_hidden_proto(__fputc_unlocked) */ /* psm: should this be fputwc? */ -libc_hidden_proto(fputc) +/* libc_hidden_proto(fputc) */ wint_t putwchar(wchar_t wc) { diff --git a/libc/stdio/remove.c b/libc/stdio/remove.c index f322411e4..c186164b8 100644 --- a/libc/stdio/remove.c +++ b/libc/stdio/remove.c @@ -10,8 +10,8 @@ #include #include -libc_hidden_proto(rmdir) -libc_hidden_proto(unlink) +/* libc_hidden_proto(rmdir) */ +/* libc_hidden_proto(unlink) */ /* SUSv3 states: * If path does not name a directory, remove(path) shall be equivalent @@ -19,7 +19,7 @@ libc_hidden_proto(unlink) * equivalent to rmdir(path). */ -libc_hidden_proto(remove) +/* libc_hidden_proto(remove) */ int remove(register const char *filename) { int saved_errno = errno; diff --git a/libc/stdio/rewind.c b/libc/stdio/rewind.c index e04d7a086..600f8cd0e 100644 --- a/libc/stdio/rewind.c +++ b/libc/stdio/rewind.c @@ -7,9 +7,9 @@ #include "_stdio.h" -libc_hidden_proto(fseek) +/* libc_hidden_proto(fseek) */ -libc_hidden_proto(rewind) +/* libc_hidden_proto(rewind) */ void rewind(register FILE *stream) { __STDIO_AUTO_THREADLOCK_VAR; diff --git a/libc/stdio/setbuf.c b/libc/stdio/setbuf.c index 6de2c91a1..b9bdc8b5b 100644 --- a/libc/stdio/setbuf.c +++ b/libc/stdio/setbuf.c @@ -7,7 +7,7 @@ #include "_stdio.h" -libc_hidden_proto(setvbuf) +/* libc_hidden_proto(setvbuf) */ void setbuf(FILE * __restrict stream, register char * __restrict buf) { diff --git a/libc/stdio/setbuffer.c b/libc/stdio/setbuffer.c index ea2421aa8..428b38936 100644 --- a/libc/stdio/setbuffer.c +++ b/libc/stdio/setbuffer.c @@ -9,7 +9,7 @@ #ifdef __USE_BSD -libc_hidden_proto(setvbuf) +/* libc_hidden_proto(setvbuf) */ /* A BSD function. The implementation matches the linux man page, * except that we do not bother calling setvbuf if not configured diff --git a/libc/stdio/setlinebuf.c b/libc/stdio/setlinebuf.c index 9b4be53eb..564776989 100644 --- a/libc/stdio/setlinebuf.c +++ b/libc/stdio/setlinebuf.c @@ -9,7 +9,7 @@ #ifdef __USE_BSD -libc_hidden_proto(setvbuf) +/* libc_hidden_proto(setvbuf) */ /* A BSD function. The implementation matches the linux man page, * except that we do not bother calling setvbuf if not configured diff --git a/libc/stdio/setvbuf.c b/libc/stdio/setvbuf.c index 6dbb532db..7f0c6f6f3 100644 --- a/libc/stdio/setvbuf.c +++ b/libc/stdio/setvbuf.c @@ -14,7 +14,7 @@ #error Assumption violated for buffering mode flags #endif -libc_hidden_proto(setvbuf) +/* libc_hidden_proto(setvbuf) */ int setvbuf(register FILE * __restrict stream, register char * __restrict buf, int mode, size_t size) { diff --git a/libc/stdio/snprintf.c b/libc/stdio/snprintf.c index ef9c69215..1b1f089cd 100644 --- a/libc/stdio/snprintf.c +++ b/libc/stdio/snprintf.c @@ -12,9 +12,9 @@ #warning Skipping snprintf since no vsnprintf! #else -libc_hidden_proto(vsnprintf) +/* libc_hidden_proto(vsnprintf) */ -libc_hidden_proto(snprintf) +/* libc_hidden_proto(snprintf) */ int snprintf(char *__restrict buf, size_t size, const char * __restrict format, ...) { diff --git a/libc/stdio/sprintf.c b/libc/stdio/sprintf.c index 2528720e4..594c51b86 100644 --- a/libc/stdio/sprintf.c +++ b/libc/stdio/sprintf.c @@ -12,7 +12,7 @@ #warning Skipping sprintf since no vsnprintf! #else -libc_hidden_proto(vsnprintf) +/* libc_hidden_proto(vsnprintf) */ /* libc_hidden_proto(sprintf) */ int sprintf(char *__restrict buf, const char * __restrict format, ...) diff --git a/libc/stdio/swprintf.c b/libc/stdio/swprintf.c index 0c209fe4b..4af8a6b11 100644 --- a/libc/stdio/swprintf.c +++ b/libc/stdio/swprintf.c @@ -9,7 +9,7 @@ #include #include -libc_hidden_proto(vswprintf) +/* libc_hidden_proto(vswprintf) */ #ifndef __STDIO_BUFFERS #warning Skipping swprintf since no buffering! diff --git a/libc/stdio/tmpfile.c b/libc/stdio/tmpfile.c index 05143d3ea..bb843affd 100644 --- a/libc/stdio/tmpfile.c +++ b/libc/stdio/tmpfile.c @@ -21,8 +21,8 @@ #include #include "../misc/internals/tempname.h" -libc_hidden_proto(fdopen) -libc_hidden_proto(remove) +/* libc_hidden_proto(fdopen) */ +/* libc_hidden_proto(remove) */ /* libc_hidden_proto(close) */ /* This returns a new stream opened on a temporary file (generated diff --git a/libc/stdio/ungetc.c b/libc/stdio/ungetc.c index d900928b2..dcec91904 100644 --- a/libc/stdio/ungetc.c +++ b/libc/stdio/ungetc.c @@ -24,7 +24,7 @@ * (See section 7.19.6.2 of the C9X rationale -- WG14/N897.) */ -libc_hidden_proto(ungetc) +/* libc_hidden_proto(ungetc) */ int ungetc(int c, register FILE *stream) { __STDIO_AUTO_THREADLOCK_VAR; diff --git a/libc/stdio/ungetwc.c b/libc/stdio/ungetwc.c index 579022240..438cb7572 100644 --- a/libc/stdio/ungetwc.c +++ b/libc/stdio/ungetwc.c @@ -12,7 +12,7 @@ * as reset stream->__ungot_width[1] for use by _stdio_adjpos(). */ -libc_hidden_proto(ungetwc) +/* libc_hidden_proto(ungetwc) */ wint_t ungetwc(wint_t c, register FILE *stream) { __STDIO_AUTO_THREADLOCK_VAR; diff --git a/libc/stdio/vasprintf.c b/libc/stdio/vasprintf.c index 3c8256870..02f495efb 100644 --- a/libc/stdio/vasprintf.c +++ b/libc/stdio/vasprintf.c @@ -23,14 +23,14 @@ #else #ifdef __UCLIBC_HAS_GLIBC_CUSTOM_STREAMS__ -libc_hidden_proto(open_memstream) +/* libc_hidden_proto(open_memstream) */ /* libc_hidden_proto(fclose) */ /* libc_hidden_proto(vfprintf) */ #else -libc_hidden_proto(vsnprintf) +/* libc_hidden_proto(vsnprintf) */ #endif -libc_hidden_proto(vasprintf) +/* libc_hidden_proto(vasprintf) */ int vasprintf(char **__restrict buf, const char * __restrict format, va_list arg) { diff --git a/libc/stdio/vdprintf.c b/libc/stdio/vdprintf.c index f00df05bc..b51aba4be 100644 --- a/libc/stdio/vdprintf.c +++ b/libc/stdio/vdprintf.c @@ -14,9 +14,9 @@ #ifdef __USE_OLD_VFPRINTF__ /* libc_hidden_proto(vfprintf) */ #endif -libc_hidden_proto(fflush_unlocked) +/* libc_hidden_proto(fflush_unlocked) */ -libc_hidden_proto(vdprintf) +/* libc_hidden_proto(vdprintf) */ int vdprintf(int filedes, const char * __restrict format, va_list arg) { FILE f; diff --git a/libc/stdio/vsnprintf.c b/libc/stdio/vsnprintf.c index 06636c2f1..01ffb4ba0 100644 --- a/libc/stdio/vsnprintf.c +++ b/libc/stdio/vsnprintf.c @@ -8,7 +8,7 @@ #include "_stdio.h" #include -libc_hidden_proto(vsnprintf) +/* libc_hidden_proto(vsnprintf) */ #ifdef __USE_OLD_VFPRINTF__ /* libc_hidden_proto(vfprintf) */ diff --git a/libc/stdio/vsprintf.c b/libc/stdio/vsprintf.c index 8e27c19d9..b44789e69 100644 --- a/libc/stdio/vsprintf.c +++ b/libc/stdio/vsprintf.c @@ -12,7 +12,7 @@ #warning Skipping vsprintf since no vsnprintf! #else -libc_hidden_proto(vsnprintf) +/* libc_hidden_proto(vsnprintf) */ int vsprintf(char *__restrict buf, const char * __restrict format, va_list arg) diff --git a/libc/stdio/vswprintf.c b/libc/stdio/vswprintf.c index cddf1d5d9..beadb8a7d 100644 --- a/libc/stdio/vswprintf.c +++ b/libc/stdio/vswprintf.c @@ -9,7 +9,7 @@ #include #include -libc_hidden_proto(vswprintf) +/* libc_hidden_proto(vswprintf) */ /* NB: this file is not used if __USE_OLD_VFPRINTF__ */ diff --git a/libc/stdio/vwprintf.c b/libc/stdio/vwprintf.c index 1c32887a4..4e666cb54 100644 --- a/libc/stdio/vwprintf.c +++ b/libc/stdio/vwprintf.c @@ -9,7 +9,7 @@ #include #include -libc_hidden_proto(vfwprintf) +/* libc_hidden_proto(vfwprintf) */ int vwprintf(const wchar_t * __restrict format, va_list arg) { diff --git a/libc/stdio/wprintf.c b/libc/stdio/wprintf.c index 9dc274aec..80d76d5bb 100644 --- a/libc/stdio/wprintf.c +++ b/libc/stdio/wprintf.c @@ -9,7 +9,7 @@ #include #include -libc_hidden_proto(vfwprintf) +/* libc_hidden_proto(vfwprintf) */ int wprintf(const wchar_t * __restrict format, ...) { -- cgit v1.2.3