From 49c46892a8bf1d88917f4786dc389677ca0124d1 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 9 Sep 2005 00:06:28 +0000 Subject: revert pthread_exit change until all files using new prototype is ready --- libpthread/linuxthreads/condvar.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libpthread') diff --git a/libpthread/linuxthreads/condvar.c b/libpthread/linuxthreads/condvar.c index 823d1236c..b051afd4c 100644 --- a/libpthread/linuxthreads/condvar.c +++ b/libpthread/linuxthreads/condvar.c @@ -126,7 +126,7 @@ int __pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex) if (already_canceled) { __pthread_set_own_extricate_if(self, 0); - __pthread_do_exit(PTHREAD_CANCELED, CURRENT_STACK_FRAME); + pthread_exit(PTHREAD_CANCELED); } pthread_mutex_unlock(mutex); @@ -155,7 +155,7 @@ int __pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex) && THREAD_GETMEM(self, p_cancelstate) == PTHREAD_CANCEL_ENABLE) { THREAD_SETMEM(self, p_woken_by_cancel, 0); pthread_mutex_lock(mutex); - __pthread_do_exit(PTHREAD_CANCELED, CURRENT_STACK_FRAME); + pthread_exit(PTHREAD_CANCELED); } /* Put back any resumes we caught that don't belong to us. */ @@ -211,7 +211,7 @@ pthread_cond_timedwait_relative(pthread_cond_t *cond, if (already_canceled) { __pthread_set_own_extricate_if(self, 0); - __pthread_do_exit(PTHREAD_CANCELED, CURRENT_STACK_FRAME); + pthread_exit(PTHREAD_CANCELED); } pthread_mutex_unlock(mutex); @@ -259,7 +259,7 @@ pthread_cond_timedwait_relative(pthread_cond_t *cond, && THREAD_GETMEM(self, p_cancelstate) == PTHREAD_CANCEL_ENABLE) { THREAD_SETMEM(self, p_woken_by_cancel, 0); pthread_mutex_lock(mutex); - __pthread_do_exit(PTHREAD_CANCELED, CURRENT_STACK_FRAME); + pthread_exit(PTHREAD_CANCELED); } /* Put back any resumes we caught that don't belong to us. */ -- cgit v1.2.3