From 7270c874630a097227a07891dd50bf8baefc3f07 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Fri, 8 Dec 2006 03:19:36 +0000
Subject: finish the pthread locking cleanups.  This should get things
 compiling again though I still need to silence the warnings about
 _pthread_cleanup_push_defer

---
 libc/misc/pthread/Makefile.in                   | 2 +-
 libc/sysdeps/linux/common/bits/uClibc_mutex.h   | 1 +
 libc/sysdeps/linux/common/bits/uClibc_pthread.h | 3 +--
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'libc')

diff --git a/libc/misc/pthread/Makefile.in b/libc/misc/pthread/Makefile.in
index fc138c91a..a768ac8f9 100644
--- a/libc/misc/pthread/Makefile.in
+++ b/libc/misc/pthread/Makefile.in
@@ -8,7 +8,7 @@
 MISC_PTHREAD_DIR := $(top_srcdir)libc/misc/pthread
 MISC_PTHREAD_OUT := $(top_builddir)libc/misc/pthread
 
-libc-static-$(UCLIBC_HAS_THREADS) += $(MISC_PTHREAD_OUT)/weaks.o
+libc-$(UCLIBC_HAS_THREADS) += $(MISC_PTHREAD_OUT)/weaks.o
 
 objclean-y += misc_pthread_objclean
 
diff --git a/libc/sysdeps/linux/common/bits/uClibc_mutex.h b/libc/sysdeps/linux/common/bits/uClibc_mutex.h
index 5464c2285..45b4b07df 100644
--- a/libc/sysdeps/linux/common/bits/uClibc_mutex.h
+++ b/libc/sysdeps/linux/common/bits/uClibc_mutex.h
@@ -13,6 +13,7 @@
 #ifdef __UCLIBC_HAS_THREADS__
 
 #include <pthread.h>
+#include <bits/uClibc_pthread.h>
 
 #define __UCLIBC_MUTEX_TYPE				pthread_mutex_t
 
diff --git a/libc/sysdeps/linux/common/bits/uClibc_pthread.h b/libc/sysdeps/linux/common/bits/uClibc_pthread.h
index a3be2ca35..f247ea673 100644
--- a/libc/sysdeps/linux/common/bits/uClibc_pthread.h
+++ b/libc/sysdeps/linux/common/bits/uClibc_pthread.h
@@ -28,8 +28,7 @@
 #endif
 
 extern int __pthread_mutex_init (pthread_mutex_t *__restrict __mutex,
-								 __const pthread_mutexattr_t *__restrict
-								 __mutex_attr) attribute_hidden;
+		__const pthread_mutexattr_t *__restrict __mutex_attr) attribute_hidden;
 extern int __pthread_mutex_trylock (pthread_mutex_t *__mutex) attribute_hidden;
 extern int __pthread_mutex_lock (pthread_mutex_t *__mutex) attribute_hidden;
 extern int __pthread_mutex_unlock (pthread_mutex_t *__mutex) attribute_hidden;
-- 
cgit v1.2.3