make gcc4 happy w/ hidden_def/proto, correct some typos

10 files changed, 19 insertions, 16 deletions

diff --git a/libc/stdio/fflush.c b/libc/stdio/fflush.c
index a03c311e0..c0f58d8af 100644
--- a/libc/stdio/fflush.c
+++ b/libc/stdio/fflush.c
@@ -130,8 +130,8 @@ int fflush_unlocked(register FILE *stream)
 libc_hidden_def(fflush_unlocked)
 
 #ifndef __UCLIBC_HAS_THREADS__
-strong_alias(fflush_unlocked,fflush)
 libc_hidden_proto(fflush)
+strong_alias(fflush_unlocked,fflush)
 libc_hidden_def(fflush)
 #endif
 
diff --git a/libc/stdio/fgetc.c b/libc/stdio/fgetc.c
index eb8c58254..7eb2b6ea2 100644
--- a/libc/stdio/fgetc.c
+++ b/libc/stdio/fgetc.c
@@ -75,21 +75,23 @@ int __fgetc_unlocked(FILE *stream)
 }
 libc_hidden_def(__fgetc_unlocked)
 
-strong_alias(__fgetc_unlocked,fgetc_unlocked)
 libc_hidden_proto(fgetc_unlocked)
+strong_alias(__fgetc_unlocked,fgetc_unlocked)
 libc_hidden_def(fgetc_unlocked)
 
-//strong_alias(__fgetc_unlocked,__getc_unlocked)
 //libc_hidden_proto(__getc_unlocked)
+//strong_alias(__fgetc_unlocked,__getc_unlocked)
 //libc_hidden_def(__getc_unlocked)
-strong_alias(__fgetc_unlocked,getc_unlocked)
+
 libc_hidden_proto(getc_unlocked)
+strong_alias(__fgetc_unlocked,getc_unlocked)
 libc_hidden_def(getc_unlocked)
 
 #ifndef __UCLIBC_HAS_THREADS__
-strong_alias(__fgetc_unlocked,fgetc)
 libc_hidden_proto(fgetc)
+strong_alias(__fgetc_unlocked,fgetc)
 libc_hidden_def(fgetc)
+
 strong_alias(__fgetc_unlocked,getc)
 #endif
 
diff --git a/libc/stdio/fgets.c b/libc/stdio/fgets.c
index ae2ecdc8d..5acaf91ed 100644
--- a/libc/stdio/fgets.c
+++ b/libc/stdio/fgets.c
@@ -64,8 +64,8 @@ char *fgets_unlocked(char *__restrict s, int n,
 libc_hidden_def(fgets_unlocked)
 
 #ifndef __UCLIBC_HAS_THREADS__
-strong_alias(fgets_unlocked,fgets)
 libc_hidden_proto(fgets)
+strong_alias(fgets_unlocked,fgets)
 libc_hidden_def(fgets)
 #endif
 
diff --git a/libc/stdio/fgetwc.c b/libc/stdio/fgetwc.c
index 716a8e9c0..062d825d6 100644
--- a/libc/stdio/fgetwc.c
+++ b/libc/stdio/fgetwc.c
@@ -113,9 +113,10 @@ libc_hidden_def(fgetwc_unlocked)
 
 strong_alias(fgetwc_unlocked,getwc_unlocked)
 #ifndef __UCLIBC_HAS_THREADS__
-strong_alias(fgetwc_unlocked,fgetwc)
 libc_hidden_proto(fgetwc)
+strong_alias(fgetwc_unlocked,fgetwc)
 libc_hidden_def(fgetwc)
+
 strong_alias(fgetwc_unlocked,getwc)
 #endif
 
@@ -136,6 +137,6 @@ wint_t fgetwc(register FILE *stream)
 	return retval;
 }
 libc_hidden_def(fgetwc)
-strong_alias(fgetwc,getwc)
 
+strong_alias(fgetwc,getwc)
 #endif
diff --git a/libc/stdio/fileno.c b/libc/stdio/fileno.c
index deeff71b1..929936bfd 100644
--- a/libc/stdio/fileno.c
+++ b/libc/stdio/fileno.c
@@ -25,8 +25,8 @@ int fileno_unlocked(register FILE *stream)
 libc_hidden_def(fileno_unlocked)
 
 #ifndef __UCLIBC_HAS_THREADS__
-strong_alias(fileno_unlocked,fileno)
 libc_hidden_proto(fileno)
+strong_alias(fileno_unlocked,fileno)
 libc_hidden_def(fileno)
 #endif
 
diff --git a/libc/stdio/fputc.c b/libc/stdio/fputc.c
index bbc72ab86..8c80bff27 100644
--- a/libc/stdio/fputc.c
+++ b/libc/stdio/fputc.c
@@ -74,14 +74,14 @@ libc_hidden_def(__fputc_unlocked)
 
 strong_alias(__fputc_unlocked,fputc_unlocked)
 
-strong_alias(__fputc_unlocked,putc_unlocked)
 libc_hidden_proto(putc_unlocked)
+strong_alias(__fputc_unlocked,putc_unlocked)
 libc_hidden_def(putc_unlocked)
 #ifndef __UCLIBC_HAS_THREADS__
 strong_alias(__fputc_unlocked,fputc)
 
-strong_alias(__fputc_unlocked,putc)
 libc_hidden_proto(putc)
+strong_alias(__fputc_unlocked,putc)
 libc_hidden_def(putc)
 #endif
 
@@ -102,8 +102,8 @@ int fputc(int c, register FILE *stream)
 }
 libc_hidden_def(fputc)
 
-strong_alias(fputc,putc)
 libc_hidden_proto(putc)
+strong_alias(fputc,putc)
 libc_hidden_def(putc)
 
 #endif
diff --git a/libc/stdio/fputs.c b/libc/stdio/fputs.c
index a2d9c22c3..4111491d6 100644
--- a/libc/stdio/fputs.c
+++ b/libc/stdio/fputs.c
@@ -29,8 +29,8 @@ int fputs_unlocked(register const char * __restrict s,
 libc_hidden_def(fputs_unlocked)
 
 #ifndef __UCLIBC_HAS_THREADS__
-strong_alias(fputs_unlocked,fputs)
 libc_hidden_proto(fputs)
+strong_alias(fputs_unlocked,fputs)
 libc_hidden_def(fputs)
 #endif
 
diff --git a/libc/stdio/fputws.c b/libc/stdio/fputws.c
index 2557155d6..ecbc121dd 100644
--- a/libc/stdio/fputws.c
+++ b/libc/stdio/fputws.c
@@ -23,8 +23,8 @@ int fputws_unlocked(const wchar_t *__restrict ws,
 libc_hidden_def(fputws_unlocked)
 
 #ifndef __UCLIBC_HAS_THREADS__
-strong_alias(fputws_unlocked,fputws)
 libc_hidden_proto(fputws)
+strong_alias(fputws_unlocked,fputws)
 libc_hidden_def(fputws)
 #endif
 
diff --git a/libc/stdio/fread.c b/libc/stdio/fread.c
index 3145553c2..c603a9d2e 100644
--- a/libc/stdio/fread.c
+++ b/libc/stdio/fread.c
@@ -90,8 +90,8 @@ size_t fread_unlocked(void * __restrict ptr, size_t size, size_t nmemb,
 libc_hidden_def(fread_unlocked)
 
 #ifndef __UCLIBC_HAS_THREADS__
-strong_alias(fread_unlocked,fread)
 libc_hidden_proto(fread)
+strong_alias(fread_unlocked,fread)
 libc_hidden_def(fread)
 #endif
 
diff --git a/libc/stdio/fwrite.c b/libc/stdio/fwrite.c
index 85ca6050e..7be794ab4 100644
--- a/libc/stdio/fwrite.c
+++ b/libc/stdio/fwrite.c
@@ -38,8 +38,8 @@ size_t fwrite_unlocked(const void * __restrict ptr, size_t size,
 libc_hidden_def(fwrite_unlocked)
 
 #ifndef __UCLIBC_HAS_THREADS__
-strong_alias(fwrite_unlocked,fwrite)
 libc_hidden_proto(fwrite)
+strong_alias(fwrite_unlocked,fwrite)
 libc_hidden_def(fwrite)
 #endif