[git commit future 1/1] remove duplicate prototypes for _stdio_term().

Khem Raj raj.khem at gmail.com
Sat Mar 19 18:51:25 UTC 2011


commit: http://git.uclibc.org/uClibc/commit/?id=cdd830027b744e1e022732499d74abe8ed8a5ed5
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/future

Signed-off-by: Peter S. Mazinger <ps.m at gmx.net>
---
 libc/stdio/_stdio.c   |    2 +-
 libc/stdlib/_atexit.c |    2 +-
 libc/stdlib/abort.c   |    3 ---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/libc/stdio/_stdio.c b/libc/stdio/_stdio.c
index 6c11451..3cbf92e 100644
--- a/libc/stdio/_stdio.c
+++ b/libc/stdio/_stdio.c
@@ -185,7 +185,7 @@ void attribute_hidden __stdio_init_mutex(__UCLIBC_MUTEX_TYPE *m)
 /**********************************************************************/
 
 /* We assume here that we are the only remaining thread. */
-void attribute_hidden _stdio_term(void)
+void _stdio_term(void)
 {
 #if defined(__STDIO_BUFFERS) || defined(__UCLIBC_HAS_GLIBC_CUSTOM_STREAMS__)
 	register FILE *ptr;
diff --git a/libc/stdlib/_atexit.c b/libc/stdlib/_atexit.c
index 1913550..60c5341 100644
--- a/libc/stdlib/_atexit.c
+++ b/libc/stdlib/_atexit.c
@@ -40,6 +40,7 @@
 #include <features.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <errno.h>
 #include <atomic.h>
 
@@ -303,7 +304,6 @@ void __exit_handler(int status)
 #endif
 
 #ifdef L_exit
-extern void weak_function _stdio_term(void) attribute_hidden;
 attribute_hidden void (*__exit_cleanup) (int) = 0;
 __UCLIBC_MUTEX_INIT(__atexit_lock, PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP);
 
diff --git a/libc/stdlib/abort.c b/libc/stdlib/abort.c
index 3cc7963..8d7c3dc 100644
--- a/libc/stdlib/abort.c
+++ b/libc/stdlib/abort.c
@@ -36,9 +36,6 @@ Cambridge, MA 02139, USA.  */
 # warning "no abort instruction defined for your arch"
 #endif
 
-#ifdef __UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT__
-extern void weak_function _stdio_term(void) attribute_hidden;
-#endif
 static smallint been_there_done_that = 0;
 
 /* Be prepared in case multiple threads try to abort() */
-- 
1.7.3.4



More information about the uClibc-cvs mailing list