summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--condvar.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d2573b7..a0e873d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
Thu Aug 6 15:19:22 1998 Ross Johnson <rpj@swan.canberra.edu.au>
+ * condvar.c (pthread_cond_init): Add address-of operator & to
+ arg 1 of pthread_mutex_init() call.
+ (pthread_cond_destroy): Add address-of operator & to
+ arg 1 of pthread_mutex_destroy() call.
+
* cleanup.c (_pthread_destructor_pop_all): Add (int) cast to
pthread_getspecific() arg.
(_pthread_destructor_pop): Add (void *) cast to "if" conditional.
diff --git a/condvar.c b/condvar.c
index 0f7a8c8..dc98ec4 100644
--- a/condvar.c
+++ b/condvar.c
@@ -47,7 +47,7 @@ pthread_cond_init(pthread_cond_t *cv, const pthread_condattr_t *attr)
cv->waiters_count = 0;
/* Initialize the "mutex". FIXME: Check attributes arg. */
- pthread_mutex_init(cv->waiters_count_lock, NULL);
+ pthread_mutex_init(&cv->waiters_count_lock, NULL);
/* Create an auto-reset event. */
cv->events[SIGNAL] = CreateEvent (NULL, /* no security */
@@ -198,5 +198,5 @@ pthread_cond_destroy(pthread_cond_t *cv)
return EINVAL;
}
- return pthread_mutex_destroy(cv->waiters_count_lock);
+ return pthread_mutex_destroy(&cv->waiters_count_lock);
}