Undo earlier change and sync new linuxthreads' guard w/ old

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

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