From 6cf489f9bca4139f92dcb3a6bc33731476bc4e91 Mon Sep 17 00:00:00 2001 From: Brian Wellington Date: Fri, 5 Jan 2001 02:17:03 +0000 Subject: [PATCH] Enabling mutex profiling caused compilation to fail. --- lib/isc/pthreads/condition.c | 4 ++-- lib/isc/pthreads/include/isc/condition.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/isc/pthreads/condition.c b/lib/isc/pthreads/condition.c index 6dbc8cf96b..12f6de232e 100644 --- a/lib/isc/pthreads/condition.c +++ b/lib/isc/pthreads/condition.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: condition.c,v 1.27 2001/01/04 23:38:36 neild Exp $ */ +/* $Id: condition.c,v 1.28 2001/01/05 02:17:02 bwelling Exp $ */ #include @@ -50,7 +50,7 @@ isc_condition_waituntil(isc_condition_t *c, isc_mutex_t *m, isc_time_t *t) { do { #if ISC_MUTEX_PROFILE - presult = pthread_cond_timedwait(c, m->mutex, &ts); + presult = pthread_cond_timedwait(c, &m->mutex, &ts); #else presult = pthread_cond_timedwait(c, m, &ts); #endif diff --git a/lib/isc/pthreads/include/isc/condition.h b/lib/isc/pthreads/include/isc/condition.h index 18c5e0a85a..1cc5a8e457 100644 --- a/lib/isc/pthreads/include/isc/condition.h +++ b/lib/isc/pthreads/include/isc/condition.h @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: condition.h,v 1.19 2001/01/04 23:38:37 neild Exp $ */ +/* $Id: condition.h,v 1.20 2001/01/05 02:17:03 bwelling Exp $ */ #ifndef ISC_CONDITION_H #define ISC_CONDITION_H 1 @@ -33,7 +33,7 @@ typedef pthread_cond_t isc_condition_t; #if ISC_MUTEX_PROFILE #define isc_condition_wait(cp, mp) \ - ((pthread_cond_wait((cp), (mp->mutex)) == 0) ? \ + ((pthread_cond_wait((cp), &((mp)->mutex)) == 0) ? \ ISC_R_SUCCESS : ISC_R_UNEXPECTED) #else #define isc_condition_wait(cp, mp) \