diff options
| author |   guenther <guenther@openbsd.org> | 2012-04-10 21:10:45 +0000 |
|---|---|---|
| committer | guenther <guenther@openbsd.org> | 2012-04-10 21:10:45 +0000 |
| commit | fd03103111f38b3c88c6baa4c3d73a4d33ff1e0a (patch) | |
| tree | 4982307752023488c775f23ae3c30287deea6ec2 | |
| parent | Add a start record to the ktrace and use a special magic string "KTR" (diff) | |
| download | wireguard-openbsd-fd03103111f38b3c88c6baa4c3d73a4d33ff1e0a.tar.xz wireguard-openbsd-fd03103111f38b3c88c6baa4c3d73a4d33ff1e0a.zip | |
pthread_setcanceltype() shouldn't be a cancelation point
ok kurt@
| -rw-r--r-- | lib/librthread/rthread.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/librthread/rthread.c b/lib/librthread/rthread.c index f1ced8f5b94..f8f6605e726 100644 --- a/lib/librthread/rthread.c +++ b/lib/librthread/rthread.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rthread.c,v 1.60 2012/03/22 15:26:04 kurt Exp $ */ +/* $OpenBSD: rthread.c,v 1.61 2012/04/10 21:10:45 guenther Exp $ */ /* * Copyright (c) 2004,2005 Ted Unangst <tedu@openbsd.org> * All Rights Reserved. @@ -506,7 +506,6 @@ pthread_setcanceltype(int type, int *oldtypep) PTHREAD_CANCEL_DEFERRED : PTHREAD_CANCEL_ASYNCHRONOUS; if (type == PTHREAD_CANCEL_DEFERRED) { _rthread_setflag(self, THREAD_CANCEL_DEFERRED); - pthread_testcancel(); } else if (type == PTHREAD_CANCEL_ASYNCHRONOUS) { _rthread_clearflag(self, THREAD_CANCEL_DEFERRED); } else { |