svn commit: trunk/uClibc/libc/stdio

[psm at uclibc.org]

Author: psm
Date: 2005-12-13 13:30:04 -0800 (Tue, 13 Dec 2005)
New Revision: 12877

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

Modified:
   trunk/uClibc/libc/stdio/fflush.c
   trunk/uClibc/libc/stdio/fopen.c


Changeset:
Modified: trunk/uClibc/libc/stdio/fflush.c
===================================================================
--- trunk/uClibc/libc/stdio/fflush.c	2005-12-13 21:25:39 UTC (rev 12876)
+++ trunk/uClibc/libc/stdio/fflush.c	2005-12-13 21:30:04 UTC (rev 12877)
@@ -126,14 +126,15 @@
 #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 @@
 
 	return retval;
 }
+strong_alias(__fflush,fflush)
 
 #endif

Modified: trunk/uClibc/libc/stdio/fopen.c
===================================================================
--- trunk/uClibc/libc/stdio/fopen.c	2005-12-13 21:25:39 UTC (rev 12876)
+++ trunk/uClibc/libc/stdio/fopen.c	2005-12-13 21:30:04 UTC (rev 12877)
@@ -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)