From fd888bef4460b1923ee177c5fb7a3337aa1a945f Mon Sep 17 00:00:00 2001
From: "Peter S. Mazinger" <ps.m@gmx.net>
Date: Thu, 16 Feb 2006 15:31:32 +0000
Subject: Undo earlier change and sync new linuxthreads' guard w/ old

---
 libc/sysdeps/linux/common/bits/uClibc_pthread.h   | 2 --
 libpthread/linuxthreads/sysdeps/pthread/pthread.h | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/libc/sysdeps/linux/common/bits/uClibc_pthread.h b/libc/sysdeps/linux/common/bits/uClibc_pthread.h
index df12fc348..a3be2ca35 100644
--- a/libc/sysdeps/linux/common/bits/uClibc_pthread.h
+++ b/libc/sysdeps/linux/common/bits/uClibc_pthread.h
@@ -27,13 +27,11 @@
 # error "Always include <pthread.h> rather than <bits/uClibc_pthread.h>"
 #endif
 
-#if defined _LIBC && ( defined IS_IN_libc || defined NOT_IN_libc )
 extern int __pthread_mutex_init (pthread_mutex_t *__restrict __mutex,
 								 __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;
-#endif
 
 #endif
diff --git a/libpthread/linuxthreads/sysdeps/pthread/pthread.h b/libpthread/linuxthreads/sysdeps/pthread/pthread.h
index 44e0e72a5..8c54c78bf 100644
--- a/libpthread/linuxthreads/sysdeps/pthread/pthread.h
+++ b/libpthread/linuxthreads/sysdeps/pthread/pthread.h
@@ -24,7 +24,7 @@
 #include <signal.h>
 #include <bits/pthreadtypes.h>
 #include <bits/initspin.h>
-#ifdef _LIBC
+#if defined _LIBC && ( defined IS_IN_libc && NOT_IN_libc )
 #include <bits/uClibc_pthread.h>
 #endif
 
-- 
cgit v1.2.3