diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | include/pthread/pthread.h | 7 | ||||
| -rw-r--r-- | sysdeps/generic/bits/mutex.h | 2 |
3 files changed, 15 insertions, 3 deletions
@@ -1,5 +1,14 @@ 2008-08-12 Neal H. Walfield <neal@gnu.org> + * sysdeps/generic/bits/mutex.h (__PTHREAD_RECURSIVE_MUTEX_INITIALIZER): + Define. + (__PTHREAD_MUTEX_RECURSIVE_INITIALIZER): Don't define. + * include/pthread/pthread.h + (PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP) [__USE_GNU]: Define. + (PTHREAD_MUTEX_RECURSIVE_INITIALIZER_NP): Don't define. + +2008-08-12 Neal H. Walfield <neal@gnu.org> + Merge in Samuel Thibault's changes from the main line. * Makefile.am (libpthread_a_SOURCES): Add pt-getattr.c. diff --git a/include/pthread/pthread.h b/include/pthread/pthread.h index c6e056a..f7e4aae 100644 --- a/include/pthread/pthread.h +++ b/include/pthread/pthread.h @@ -311,8 +311,11 @@ extern int pthread_mutexattr_settype(pthread_mutexattr_t *attr, #define PTHREAD_MUTEX_INITIALIZER __PTHREAD_MUTEX_INITIALIZER /* Static initializer for recursive mutexes. */ -#define PTHREAD_MUTEX_RECURSIVE_INITIALIZER_NP \ - __PTHREAD_MUTEX_RECURSIVE_INITIALIZER + +#ifdef __USE_GNU +# define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP \ + __PTHREAD_RECURSIVE_MUTEX_INITIALIZER +#endif /* Create a mutex with attributes given by ATTR and store it in *__MUTEX. */ diff --git a/sysdeps/generic/bits/mutex.h b/sysdeps/generic/bits/mutex.h index f5f3fa9..15a83f4 100644 --- a/sysdeps/generic/bits/mutex.h +++ b/sysdeps/generic/bits/mutex.h @@ -57,7 +57,7 @@ struct __pthread_mutex # define __PTHREAD_MUTEX_INITIALIZER \ { __SPIN_LOCK_INITIALIZER, __SPIN_LOCK_INITIALIZER, 0, 0, 0, 0, 0, 0 } -# define __PTHREAD_MUTEX_RECURSIVE_INITIALIZER \ +# define __PTHREAD_RECURSIVE_MUTEX_INITIALIZER \ { __SPIN_LOCK_INITIALIZER, __SPIN_LOCK_INITIALIZER, 0, 0, \ (struct __pthread_mutexattr *) &__pthread_recursive_mutexattr, 0, 0, 0 } |