From a2102d6a91d6e4522471da3bbc3d58473400bfe7 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Tue, 2 Nov 2004 03:52:19 +0000 Subject: 2004-11-02 Marcus Brinkmann * 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. --- sysdeps/generic/bits/condition.h | 3 +-- sysdeps/generic/pt-cond-init.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'sysdeps/generic') 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; } -- cgit v1.2.3