Hidden fflush, adapt fopen to hack in libc-internal.h

diff --git a/libc/stdio/fflush.c b/libc/stdio/fflush.c
index b4226d0..0a74afe 100644 (file)
--- a/libc/stdio/fflush.c
+++ b/libc/stdio/fflush.c
@@ -126,14 +126,15 @@ int attribute_hidden __fflush_unlocked(register FILE *stream)
 #endif /* __STDIO_BUFFERS */
 }
 
-weak_alias(__fflush_unlocked,fflush_unlocked);
+weak_alias(__fflush_unlocked,fflush_unlocked)
 #ifndef __UCLIBC_HAS_THREADS__
-weak_alias(__fflush_unlocked,fflush);
+hidden_strong_alias(__fflush_unlocked,__fflush)
+weak_alias(__fflush_unlocked,fflush)
 #endif
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-int fflush(register FILE *stream)
+int attribute_hidden __fflush(register FILE *stream)
 {
        int retval;
        __STDIO_AUTO_THREADLOCK_VAR;
@@ -155,5 +156,6 @@ int fflush(register FILE *stream)
 
        return retval;
 }
+strong_alias(__fflush,fflush)
 
 #endif

diff --git a/libc/stdio/fopen.c b/libc/stdio/fopen.c
index ceea0f6..f10c326 100644 (file)
--- a/libc/stdio/fopen.c
+++ b/libc/stdio/fopen.c
@@ -9,6 +9,9 @@
 
 #ifndef __DO_LARGEFILE
 # define FILEDES_ARG    (-1)
+#undef fopen
+#else
+#undef fopen64
 #endif
 
 FILE attribute_hidden *__fopen(const char * __restrict filename, const char * __restrict mode)