diff options
Diffstat (limited to 'linuxthreads')
| -rw-r--r-- | linuxthreads/ChangeLog | 3 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/pthread/pthread.h | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index b4f2ae61b3..02d5f8eabf 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,5 +1,8 @@ 1998-06-26 Ulrich Drepper <drepper@cygnus.com> + * sysdeps/pthread/pthread.h (PTHREAD_RWLOCK_INITIALIZER): Correct + for new definition of pthread_rwlock_t. + * spinlock.c: Correct test whether to compile __pthread_compare_and_swap or not. diff --git a/linuxthreads/sysdeps/pthread/pthread.h b/linuxthreads/sysdeps/pthread/pthread.h index 127e15deef..b76c4a8d5b 100644 --- a/linuxthreads/sysdeps/pthread/pthread.h +++ b/linuxthreads/sysdeps/pthread/pthread.h @@ -46,7 +46,7 @@ typedef struct _pthread_descr_struct *_pthread_descr; /* Fast locks (not abstract because mutexes and conditions aren't abstract). */ struct _pthread_fastlock { - long status; /* "Free" or "taken" or head of waiting list */ + long int status; /* "Free" or "taken" or head of waiting list */ int spinlock; /* For compare-and-swap emulation */ }; @@ -91,7 +91,7 @@ typedef struct } pthread_rwlock_t; # define PTHREAD_RWLOCK_INITIALIZER \ - { 0, 0, 0, {0, 0}, {0, 0}, \ + { {0, 0}, 0, NULL, NULL, NULL, \ PTHREAD_RWLOCK_DEFAULT_NP, PTHREAD_PROCESS_PRIVATE } #endif |