From e941c481e708afac23851eaaf55ad6f06fd996ab Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Sat, 19 Mar 2011 15:51:14 +0100 Subject: uClibc_stdio.h: move internal to _stdio.h and make them hidden Move __stdio_mutex_init,_stdio_openlist_{use,del}_count to _stdio.h. Make _stdio_validate_FILE hidden. Make _stdio_openlist_{add,del}_lock hidden for non-NPTL. Signed-off-by: Peter S. Mazinger Signed-off-by: Bernhard Reutner-Fischer --- libc/stdio/_stdio.h | 4 ++++ libc/sysdeps/linux/common/bits/uClibc_stdio.h | 15 ++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) (limited to 'libc') diff --git a/libc/stdio/_stdio.h b/libc/stdio/_stdio.h index 2c0efc986..b8f5c98a3 100644 --- a/libc/stdio/_stdio.h +++ b/libc/stdio/_stdio.h @@ -39,6 +39,9 @@ #ifdef __UCLIBC_HAS_THREADS__ +extern void __stdio_init_mutex(__UCLIBC_MUTEX_TYPE *m) attribute_hidden; + +extern volatile int _stdio_openlist_use_count attribute_hidden; /* _stdio_openlist_del_lock */ #define __STDIO_OPENLIST_INC_USE \ do { \ __STDIO_THREADLOCK_OPENLIST_DEL; \ @@ -51,6 +54,7 @@ extern void _stdio_openlist_dec_use(void) attribute_hidden; #define __STDIO_OPENLIST_DEC_USE \ _stdio_openlist_dec_use() +extern int _stdio_openlist_del_count attribute_hidden; /* _stdio_openlist_del_lock */ #define __STDIO_OPENLIST_INC_DEL_CNT \ do { \ __STDIO_THREADLOCK_OPENLIST_DEL; \ diff --git a/libc/sysdeps/linux/common/bits/uClibc_stdio.h b/libc/sysdeps/linux/common/bits/uClibc_stdio.h index a8cf4eb56..d5a522a59 100644 --- a/libc/sysdeps/linux/common/bits/uClibc_stdio.h +++ b/libc/sysdeps/linux/common/bits/uClibc_stdio.h @@ -359,14 +359,19 @@ extern void _stdio_term(void) attribute_hidden; extern struct __STDIO_FILE_STRUCT *_stdio_openlist; #ifdef __UCLIBC_HAS_THREADS__ -__UCLIBC_IO_MUTEX_EXTERN(_stdio_openlist_add_lock); +__UCLIBC_IO_MUTEX_EXTERN(_stdio_openlist_add_lock) +# ifndef __UCLIBC_HAS_THREADS_NATIVE__ + attribute_hidden +# endif + ; #ifdef __STDIO_BUFFERS -__UCLIBC_IO_MUTEX_EXTERN(_stdio_openlist_del_lock); -extern volatile int _stdio_openlist_use_count; /* _stdio_openlist_del_lock */ -extern int _stdio_openlist_del_count; /* _stdio_openlist_del_lock */ +__UCLIBC_IO_MUTEX_EXTERN(_stdio_openlist_del_lock) +# ifndef __UCLIBC_HAS_THREADS_NATIVE__ + attribute_hidden +# endif + ; #endif extern int _stdio_user_locking; -extern void __stdio_init_mutex(__UCLIBC_MUTEX_TYPE *m) attribute_hidden; #endif #endif -- cgit v1.2.3