From 0849f6008742424ff64d36d01c096de958dc1964 Mon Sep 17 00:00:00 2001
From: "Peter S. Mazinger" <ps.m@gmx.net>
Date: Sat, 19 Mar 2011 18:06:15 +0100
Subject: uClibc_stdio.h: guard internals with _LIBC
Provide __UCLIBC_IO_MUTEX for the installed version
Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
libc/sysdeps/linux/common/bits/uClibc_stdio.h | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
(limited to 'libc')
diff --git a/libc/sysdeps/linux/common/bits/uClibc_stdio.h b/libc/sysdeps/linux/common/bits/uClibc_stdio.h
index 2641431a3..c0c3e561c 100644
--- a/libc/sysdeps/linux/common/bits/uClibc_stdio.h
+++ b/libc/sysdeps/linux/common/bits/uClibc_stdio.h
@@ -78,6 +78,7 @@
#define __STDIO_PUTC_MACRO
#endif
+#ifdef _LIBC
/**********************************************************************/
#include <bits/uClibc_mutex.h>
@@ -132,6 +133,8 @@
#endif
#endif
+#endif /* _LIBC */
+
/**********************************************************************/
#define __STDIO_IOFBF 0 /* Fully buffered. */
@@ -187,7 +190,7 @@ typedef struct {
__io_close_fn *close;
} _IO_cookie_io_functions_t;
-#if defined(_LIBC) || defined(_GNU_SOURCE)
+#ifdef __USE_GNU
typedef __io_read_fn cookie_read_function_t;
typedef __io_write_fn cookie_write_function_t;
@@ -201,6 +204,16 @@ typedef _IO_cookie_io_functions_t cookie_io_functions_t;
#endif
/**********************************************************************/
+#if defined __UCLIBC_HAS_THREADS__ && !defined __UCLIBC_IO_MUTEX
+# ifdef __UCLIBC_HAS_THREADS_NATIVE__
+# include <bits/stdio-lock.h>
+# define __UCLIBC_IO_MUTEX(M) _IO_lock_t M
+# else
+# include <bits/pthreadtypes.h>
+# define __UCLIBC_IO_MUTEX(M) pthread_mutex_t M
+# endif /* __UCLIBC_HAS_THREADS_NATIVE__ */
+#endif
+
struct __STDIO_FILE_STRUCT {
unsigned short __modeflags;
/* There could be a hole here, but modeflags is used most.*/
--
cgit v1.2.3