From dd4c03d796f73e008d93ade62655deb70aaaf34a Mon Sep 17 00:00:00 2001
From: "\"Steven J. Hill\"" <sjhill@realitydiluted.com>
Date: Sat, 24 Sep 2005 16:15:28 +0000
Subject: Big sync with trunk.

---
 libc/stdio/fgetwc.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'libc/stdio/fgetwc.c')

diff --git a/libc/stdio/fgetwc.c b/libc/stdio/fgetwc.c
index 9f1f9c481..a78f52212 100644
--- a/libc/stdio/fgetwc.c
+++ b/libc/stdio/fgetwc.c
@@ -9,13 +9,6 @@
 
 #ifdef __DO_UNLOCKED
 
-weak_alias(__fgetwc_unlocked,fgetwc_unlocked);
-weak_alias(__fgetwc_unlocked,getwc_unlocked);
-#ifndef __UCLIBC_HAS_THREADS__
-weak_alias(__fgetwc_unlocked,fgetwc);
-weak_alias(__fgetwc_unlocked,getwc);
-#endif
-
 static void munge_stream(register FILE *stream, unsigned char *buf)
 {
 	stream->__bufend = stream->__bufstart = buf;
@@ -113,9 +106,14 @@ wint_t __fgetwc_unlocked(register FILE *stream)
 	return wi;
 }
 
-#elif defined __UCLIBC_HAS_THREADS__
+weak_alias(__fgetwc_unlocked,fgetwc_unlocked);
+weak_alias(__fgetwc_unlocked,getwc_unlocked);
+#ifndef __UCLIBC_HAS_THREADS__
+weak_alias(__fgetwc_unlocked,fgetwc);
+weak_alias(__fgetwc_unlocked,getwc);
+#endif
 
-weak_alias(fgetwc,getwc);
+#elif defined __UCLIBC_HAS_THREADS__
 
 wint_t fgetwc(register FILE *stream)
 {
@@ -131,4 +129,6 @@ wint_t fgetwc(register FILE *stream)
 	return retval;
 }
 
+weak_alias(fgetwc,getwc);
+
 #endif
-- 
cgit v1.2.3