summaryrefslogtreecommitdiff
path: root/sysdeps/generic
diff options
context:
space:
mode:
authorMarcus Brinkmann <marcus@gnu.org>2004-11-02 03:52:19 +0000
committerThomas Schwinge <tschwinge@gnu.org>2009-04-06 22:40:34 +0200
commita2102d6a91d6e4522471da3bbc3d58473400bfe7 (patch)
treebfc766ad2751f56817dc029318778db2d0bdcfaa /sysdeps/generic
parent8765659aee80734a9d0a68a67c20c43a0d97eee4 (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 'sysdeps/generic')
-rw-r--r--sysdeps/generic/bits/condition.h3
-rw-r--r--sysdeps/generic/pt-cond-init.c2
2 files changed, 2 insertions, 3 deletions
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;
}