diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | pthread/pt-alloc.c | 2 | ||||
| -rw-r--r-- | sysdeps/generic/bits/condition.h | 3 | ||||
| -rw-r--r-- | sysdeps/generic/pt-cond-init.c | 2 |
4 files changed, 10 insertions, 4 deletions
@@ -1,3 +1,10 @@ +2004-11-02 Marcus Brinkmann <marcus@gnu.org> + + * sysdeps/generic/bits/condition.h (__PTHREAD_COND_INITIALIZER): + Remove compound statement. + * pthread/pt-alloc.c (initialize_pthread): Use compound statement. + * sysdeps/generic/pt-cond-init.c (pthread_cond_init): Likewise. + 2004-11-01 Marcus Brinkmann <marcus@gnu.org> * pthread/pt-create.c (__pthread_total): Change type to uatomic32_t. diff --git a/pthread/pt-alloc.c b/pthread/pt-alloc.c index dd9760d..615b728 100644 --- a/pthread/pt-alloc.c +++ b/pthread/pt-alloc.c @@ -70,7 +70,7 @@ initialize_pthread (struct __pthread *new, int recycling) new->stack = 0; new->state_lock = (struct __pthread_mutex) PTHREAD_MUTEX_INITIALIZER; - new->state_cond = PTHREAD_COND_INITIALIZER; + new->state_cond = (struct __pthread_cond) PTHREAD_COND_INITIALIZER; new->cancelation_handlers = 0; diff --git a/sysdeps/generic/bits/condition.h b/sysdeps/generic/bits/condition.h index cb7e935..a194b05 100644 --- a/sysdeps/generic/bits/condition.h +++ b/sysdeps/generic/bits/condition.h @@ -34,7 +34,6 @@ struct __pthread_cond /* Initializer for a condition variable. */ #define __PTHREAD_COND_INITIALIZER \ - ((struct __pthread_cond) \ - { __SPIN_LOCK_INITIALIZER, NULL, NULL, NULL, NULL }) + { __SPIN_LOCK_INITIALIZER, NULL, NULL, NULL, NULL } #endif /* bits/condition.h */ diff --git a/sysdeps/generic/pt-cond-init.c b/sysdeps/generic/pt-cond-init.c index 4afcc94..a01a94b 100644 --- a/sysdeps/generic/pt-cond-init.c +++ b/sysdeps/generic/pt-cond-init.c @@ -29,6 +29,6 @@ pthread_cond_init (pthread_cond_t *cond, if (attr) assert (attr->pshared == PTHREAD_PROCESS_PRIVATE); - *cond = __PTHREAD_COND_INITIALIZER; + *cond = (struct __pthread_cond) __PTHREAD_COND_INITIALIZER; return 0; } |