From 03bd3688bc7a2f79429e61b54cb7776f3300faaa Mon Sep 17 00:00:00 2001 From: EunBong Song Date: Tue, 2 May 2017 07:14:04 -0600 Subject: [PATCH] pthread: Fix compilation error on pthread_cond_wait when CONFIG_CANCELLATION_POINTS and CONFIG_PTHREAD_MUTEX_UNSAFE are enabled. --- sched/pthread/pthread.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sched/pthread/pthread.h b/sched/pthread/pthread.h index 69e08e1445a..14a5797bb82 100644 --- a/sched/pthread/pthread.h +++ b/sched/pthread/pthread.h @@ -121,7 +121,7 @@ void pthread_mutex_inconsistent(FAR struct pthread_tcb_s *tcb); # define pthread_mutex_give(m) pthread_givesemaphore(&(m)->sem) #endif -#ifdef CONFIG_CANCELLATION_POINTS +#if defined(CONFIG_CANCELLATION_POINTS) && !defined(CONFIG_PTHREAD_MUTEX_UNSAFE) uint16_t pthread_disable_cancel(void); void pthread_enable_cancel(uint16_t oldstate); #else