summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.in1
-rw-r--r--libc/sysdeps/linux/common/bits/uClibc_mutex.h2
-rw-r--r--libc/sysdeps/linux/common/bits/uClibc_pthread.h4
3 files changed, 3 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in
index 5d5897212..65b316001 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -229,6 +229,7 @@ HEADERS_RM- := \
bits/syscalls.h \
bits/syscalls-common.h \
bits/uClibc_fpmax.h \
+ bits/uClibc_pthread.h \
bits/uClibc_uintmaxtostr.h \
bits/uClibc_uwchar.h \
bits/uClibc_va_copy.h \
diff --git a/libc/sysdeps/linux/common/bits/uClibc_mutex.h b/libc/sysdeps/linux/common/bits/uClibc_mutex.h
index 8c3f6b251..94597e840 100644
--- a/libc/sysdeps/linux/common/bits/uClibc_mutex.h
+++ b/libc/sysdeps/linux/common/bits/uClibc_mutex.h
@@ -13,7 +13,9 @@
#ifdef __UCLIBC_HAS_THREADS__
#include <pthread.h>
+#ifdef _LIBC
#include <bits/uClibc_pthread.h>
+#endif
#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 15aa1deed..08673a0ac 100644
--- a/libc/sysdeps/linux/common/bits/uClibc_pthread.h
+++ b/libc/sysdeps/linux/common/bits/uClibc_pthread.h
@@ -27,8 +27,6 @@
# error "Always include <pthread.h> rather than <bits/uClibc_pthread.h>"
#endif
-#if defined _LIBC && (defined IS_IN_libc || defined NOT_IN_libc)
-
struct _pthread_cleanup_buffer;
/* Threading functions internal to uClibc. Make these thread functions
@@ -47,5 +45,3 @@ extern void weak_function _pthread_cleanup_pop_restore (
int __execute);
#endif
-
-#endif