26c26
< * $FreeBSD: head/lib/libthr/thread/thr_cond.c 177854 2008-04-02 08:33:42Z davidxu $
---
> * $FreeBSD: head/lib/libthr/thread/thr_cond.c 211524 2010-08-20 05:15:39Z davidxu $
164a165,172
> /*
> * Cancellation behaivor:
> * Thread may be canceled at start, if thread is canceled, it means it
> * did not get a wakeup from pthread_cond_signal(), otherwise, it is
> * not canceled.
> * Thread cancellation never cause wakeup from pthread_cond_signal()
> * to be lost.
> */
182a191,192
> _thr_testcancel(curthread);
>
203c213
< _thr_cancel_enter_defer(curthread);
---
> _thr_cancel_enter_defer(curthread, 0);
206c216
< _thr_cancel_leave_defer(curthread, ret);
---
> _thr_cancel_leave_defer(curthread, (ret != 0));