diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2005-09-09 00:06:28 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-09-09 00:06:28 +0000 |
| commit | 49c46892a8bf1d88917f4786dc389677ca0124d1 (patch) | |
| tree | aba99e05061aa9866a510d988576233f3a617c77 /libpthread | |
| parent | 4a8b9dee4fbd73c0366e4111c2364c72f595a58a (diff) | |
revert pthread_exit change until all files using new prototype is ready
Diffstat (limited to 'libpthread')
| -rw-r--r-- | libpthread/linuxthreads/condvar.c | 8 |
1 files changed, 4 insertions, 4 deletions
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. */ |