aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Mike Frysinger <vapier@gentoo.org>2007-01-28 07:58:45 +0000
committerGravatar Mike Frysinger <vapier@gentoo.org>2007-01-28 07:58:45 +0000
commitd1aea519cdea1724f6903dc87548cb62ede08fe7 (patch)
treec19d056482061e56734c9711e0031634217fad68
parent29d0e8bafa1ae5b520ca044c49f99a86bb047d01 (diff)
downloaduClibc-d1aea519cdea1724f6903dc87548cb62ede08fe7.tar.gz
uClibc-d1aea519cdea1724f6903dc87548cb62ede08fe7.tar.bz2
fix from trunk for compile failure when threading is disabled
-rw-r--r--libc/stdio/_stdio.h12
-rw-r--r--libc/sysdeps/linux/common/bits/uClibc_mutex.h2
2 files changed, 13 insertions, 1 deletions
diff --git a/libc/stdio/_stdio.h b/libc/stdio/_stdio.h
index decf57d3d..a95e634e2 100644
--- a/libc/stdio/_stdio.h
+++ b/libc/stdio/_stdio.h
@@ -38,6 +38,7 @@
#define __STDIO_THREADUNLOCK_OPENLIST_DEL \
__UCLIBC_MUTEX_UNLOCK(_stdio_openlist_del_lock)
+#ifdef __UCLIBC_HAS_THREADS__
#define __STDIO_OPENLIST_INC_USE \
do { \
__STDIO_THREADLOCK_OPENLIST_DEL; \
@@ -64,14 +65,25 @@ do { \
__STDIO_THREADUNLOCK_OPENLIST_DEL; \
} while (0)
+#endif /* __UCLIBC_HAS_THREADS__ */
#endif /* __STDIO_BUFFERS */
#ifndef __STDIO_THREADLOCK_OPENLIST_DEL
#define __STDIO_THREADLOCK_OPENLIST_DEL ((void)0)
+#endif
+#ifndef __STDIO_THREADUNLOCK_OPENLIST_DEL
#define __STDIO_THREADUNLOCK_OPENLIST_DEL ((void)0)
+#endif
+#ifndef __STDIO_OPENLIST_INC_USE
#define __STDIO_OPENLIST_INC_USE ((void)0)
+#endif
+#ifndef __STDIO_OPENLIST_DEC_USE
#define __STDIO_OPENLIST_DEC_USE ((void)0)
+#endif
+#ifndef __STDIO_OPENLIST_INC_DEL_CNT
#define __STDIO_OPENLIST_INC_DEL_CNT ((void)0)
+#endif
+#ifndef __STDIO_OPENLIST_DEC_DEL_CNT
#define __STDIO_OPENLIST_DEC_DEL_CNT ((void)0)
#endif
diff --git a/libc/sysdeps/linux/common/bits/uClibc_mutex.h b/libc/sysdeps/linux/common/bits/uClibc_mutex.h
index d40d49014..1dd1ea292 100644
--- a/libc/sysdeps/linux/common/bits/uClibc_mutex.h
+++ b/libc/sysdeps/linux/common/bits/uClibc_mutex.h
@@ -65,7 +65,7 @@
#define __UCLIBC_MUTEX(M) void *__UCLIBC_MUTEX_DUMMY_ ## M
#define __UCLIBC_MUTEX_INIT(M,I) extern void *__UCLIBC_MUTEX_DUMMY_ ## M
-#define __UCLIBC_MUTEX_STATIC(M) extern void *__UCLIBC_MUTEX_DUMMY_ ## M
+#define __UCLIBC_MUTEX_STATIC(M,I) extern void *__UCLIBC_MUTEX_DUMMY_ ## M
#define __UCLIBC_MUTEX_EXTERN(M) extern void *__UCLIBC_MUTEX_DUMMY_ ## M
#define __UCLIBC_MUTEX_LOCK_CANCEL_UNSAFE(M) ((void)0)