diff options
| author | Peter S. Mazinger <ps.m@gmx.net> | 2006-02-16 15:31:32 +0000 |
|---|---|---|
| committer | Peter S. Mazinger <ps.m@gmx.net> | 2006-02-16 15:31:32 +0000 |
| commit | fd888bef4460b1923ee177c5fb7a3337aa1a945f (patch) | |
| tree | 8794592eec0deb1905d588e8cf655100cdab8995 | |
| parent | 58ac99c7123e5ec489ed4868e89f50f3afaecf62 (diff) | |
Undo earlier change and sync new linuxthreads' guard w/ old
| -rw-r--r-- | libc/sysdeps/linux/common/bits/uClibc_pthread.h | 2 | ||||
| -rw-r--r-- | libpthread/linuxthreads/sysdeps/pthread/pthread.h | 2 |
2 files changed, 1 insertions, 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 |