[git commit] uClibc_pthread.h: do not install on target

Bernhard Reutner-Fischer rep.dot.nop at gmail.com
Fri Jun 15 12:00:29 UTC 2012


commit: http://git.uclibc.org/uClibc/commit/?id=7c7dd9d00f2577e667ed479ad5b1a1b5a403184a
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master

Signed-off-by: Peter S. Mazinger <ps.m at gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
 Makefile.in                                     |    1 +
 libc/sysdeps/linux/common/bits/uClibc_mutex.h   |    2 ++
 libc/sysdeps/linux/common/bits/uClibc_pthread.h |    4 ----
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 5d58972..65b3160 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 8c3f6b2..94597e8 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 15aa1de..08673a0 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


More information about the uClibc-cvs mailing list