diff options
| -rw-r--r-- | libhurd-mm/ChangeLog | 6 | ||||
| -rw-r--r-- | libhurd-mm/storage.c | 2 | ||||
| -rw-r--r-- | libpthread/ChangeLog | 9 | ||||
| -rw-r--r-- | libpthread/include/pthread/pthread.h | 7 | ||||
| -rw-r--r-- | libpthread/sysdeps/generic/bits/mutex.h | 2 |
5 files changed, 22 insertions, 4 deletions
diff --git a/libhurd-mm/ChangeLog b/libhurd-mm/ChangeLog index 6b4e512..6ad3c2d 100644 --- a/libhurd-mm/ChangeLog +++ b/libhurd-mm/ChangeLog @@ -1,3 +1,9 @@ +2008-08-12 Neal H. Walfield <neal@gnu.org> + + * storage.c (storage_low_mutex): Use + PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP, not + PTHREAD_MUTEX_RECURSIVE_INITIALIZER_NP. + 2008-07-08 Neal H. Walfield <neal@gnu.org> * as-lookup.c: Include <profile.h>, not "../viengoos/profile.h". diff --git a/libhurd-mm/storage.c b/libhurd-mm/storage.c index ba6b914..d9698a1 100644 --- a/libhurd-mm/storage.c +++ b/libhurd-mm/storage.c @@ -334,7 +334,7 @@ static bool storage_init_done; #define FREE_PAGES_SERIALIZE 16 static pthread_mutex_t storage_low_mutex - = PTHREAD_MUTEX_RECURSIVE_INITIALIZER_NP; + = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; bool storage_have_reserve (void) diff --git a/libpthread/ChangeLog b/libpthread/ChangeLog index 9e3080f..c5ae31c 100644 --- a/libpthread/ChangeLog +++ b/libpthread/ChangeLog @@ -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/libpthread/include/pthread/pthread.h b/libpthread/include/pthread/pthread.h index c6e056a..f7e4aae 100644 --- a/libpthread/include/pthread/pthread.h +++ b/libpthread/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/libpthread/sysdeps/generic/bits/mutex.h b/libpthread/sysdeps/generic/bits/mutex.h index f5f3fa9..15a83f4 100644 --- a/libpthread/sysdeps/generic/bits/mutex.h +++ b/libpthread/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 } |