diff options
| author | marcus <marcus> | 2004-11-02 03:52:17 +0000 |
|---|---|---|
| committer | marcus <marcus> | 2004-11-02 03:52:17 +0000 |
| commit | c8a3cad6258f94dd15f94a93b745696473a62c70 (patch) | |
| tree | 242c549dd51d4ffa5e468bb86f8b644b60964261 /libpthread/sysdeps/generic | |
| parent | 3c9d74243b5f614cfb400339b7d9161d57435a78 (diff) | |
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.
Diffstat (limited to 'libpthread/sysdeps/generic')
| -rw-r--r-- | libpthread/sysdeps/generic/bits/condition.h | 3 | ||||
| -rw-r--r-- | libpthread/sysdeps/generic/pt-cond-init.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/libpthread/sysdeps/generic/bits/condition.h b/libpthread/sysdeps/generic/bits/condition.h index cb7e935..a194b05 100644 --- a/libpthread/sysdeps/generic/bits/condition.h +++ b/libpthread/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/libpthread/sysdeps/generic/pt-cond-init.c b/libpthread/sysdeps/generic/pt-cond-init.c index 4afcc94..a01a94b 100644 --- a/libpthread/sysdeps/generic/pt-cond-init.c +++ b/libpthread/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; } |