summaryrefslogtreecommitdiff
path: root/lib/libpthread/uthread/uthread_join.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libpthread/uthread/uthread_join.c')
-rw-r--r--lib/libpthread/uthread/uthread_join.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/libpthread/uthread/uthread_join.c b/lib/libpthread/uthread/uthread_join.c
index 52baee31c33..ab7b7860ecc 100644
--- a/lib/libpthread/uthread/uthread_join.c
+++ b/lib/libpthread/uthread/uthread_join.c
@@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $OpenBSD: uthread_join.c,v 1.3 1999/01/17 23:57:27 d Exp $
+ * $OpenBSD: uthread_join.c,v 1.4 1999/05/26 00:18:24 d Exp $
*/
#include <errno.h>
#ifdef _THREAD_SAFE
@@ -42,6 +42,7 @@ pthread_join(pthread_t pthread, void **thread_return)
int ret = 0;
pthread_t pthread1 = NULL;
+ /* This operation is a cancel point: */
_thread_enter_cancellation_point();
/* Check if the caller has specified an invalid thread: */
@@ -99,6 +100,7 @@ pthread_join(pthread_t pthread, void **thread_return)
/* Return the thread's return value: */
*thread_return = pthread->ret;
+ /* This operation was a cancel point: */
_thread_leave_cancellation_point();
/* Return the completion status: */