Move cancellation point definitions to their own header file.

sched/mqueue/mq_rcvinternal.c

@@ -50,7 +50,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/pthread.h>
+#include <nuttx/cancelpt.h>
 
 #include "sched/sched.h"
 #include "mqueue/mqueue.h"

sched/mqueue/mq_receive.c

@@ -47,7 +47,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/pthread.h>
+#include <nuttx/cancelpt.h>
 
 #include "mqueue/mqueue.h"
 

sched/mqueue/mq_send.c

@@ -46,7 +46,7 @@
 
 #include  <nuttx/irq.h>
 #include  <nuttx/arch.h>
-#include  <nuttx/pthread.h>
+#include  <nuttx/cancelpt.h>
 
 #include  "mqueue/mqueue.h"
 

sched/mqueue/mq_sndinternal.c

@@ -53,7 +53,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/sched.h>
 #include <nuttx/signal.h>
-#include <nuttx/pthread.h>
+#include <nuttx/cancelpt.h>
 
 #include "sched/sched.h"
 #ifndef CONFIG_DISABLE_SIGNALS

sched/mqueue/mq_timedreceive.c

@@ -50,7 +50,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <nuttx/wdog.h>
-#include <nuttx/pthread.h>
+#include <nuttx/cancelpt.h>
 
 #include "sched/sched.h"
 #include "clock/clock.h"

sched/mqueue/mq_timedsend.c

@@ -50,7 +50,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <nuttx/wdog.h>
-#include <nuttx/pthread.h>
+#include <nuttx/cancelpt.h>
 
 #include "clock/clock.h"
 #include "sched/sched.h"

sched/pthread/pthread_condtimedwait.c

@@ -51,7 +51,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/wdog.h>
-#include <nuttx/pthread.h>
+#include <nuttx/cancelpt.h>
 
 #include "sched/sched.h"
 #include "pthread/pthread.h"

sched/pthread/pthread_condwait.c

@@ -45,7 +45,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/pthread.h>
+#include <nuttx/cancelpt.h>
 
 #include "pthread/pthread.h"
 

sched/pthread/pthread_join.c

@@ -45,7 +45,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/pthread.h>
+#include <nuttx/cancelpt.h>
 
 #include "sched/sched.h"
 #include "group/group.h"

sched/pthread/pthread_testcancel.c

@@ -42,7 +42,7 @@
 #include <pthread.h>
 #include <errno.h>
 
-#include <nuttx/pthread.h>
+#include <nuttx/cancelpt.h>
 
 #include "sched/sched.h"
 

sched/sched/sched_wait.c

@@ -44,7 +44,6 @@
 #include <errno.h>
 
 #include <nuttx/sched.h>
-#include <nuttx/pthread.h>
 
 #include "sched/sched.h"
 

sched/sched/sched_waitid.c

@@ -44,7 +44,7 @@
 #include <errno.h>
 
 #include <nuttx/sched.h>
-#include <nuttx/pthread.h>
+#include <nuttx/cancelpt.h>
 
 #include "sched/sched.h"
 #include "group/group.h"

sched/sched/sched_waitpid.c

@@ -45,7 +45,7 @@
 #include <errno.h>
 
 #include <nuttx/sched.h>
-#include <nuttx/pthread.h>
+#include <nuttx/cancelpt.h>
 
 #include "sched/sched.h"
 #include "group/group.h"

sched/semaphore/sem_timedwait.c

@@ -49,7 +49,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <nuttx/wdog.h>
-#include <nuttx/pthread.h>
+#include <nuttx/cancelpt.h>
 
 #include "sched/sched.h"
 #include "clock/clock.h"

sched/semaphore/sem_wait.c

@@ -46,7 +46,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/pthread.h>
+#include <nuttx/cancelpt.h>
 
 #include "sched/sched.h"
 #include "semaphore/semaphore.h"

sched/signal/sig_nanosleep.c

@@ -46,7 +46,7 @@
 
 #include <nuttx/clock.h>
 #include <nuttx/irq.h>
-#include <nuttx/pthread.h>
+#include <nuttx/cancelpt.h>
 
 #include "clock/clock.h"
 

sched/signal/sig_pause.c

@@ -42,7 +42,7 @@
 #include <unistd.h>
 #include <signal.h>
 
-#include <nuttx/pthread.h>
+#include <nuttx/cancelpt.h>
 
 /****************************************************************************
  * Public Functions

sched/signal/sig_suspend.c

@@ -46,7 +46,7 @@
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <nuttx/pthread.h>
+#include <nuttx/cancelpt.h>
 
 #include "sched/sched.h"
 #include "signal/signal.h"

sched/signal/sig_timedwait.c

@@ -52,7 +52,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <nuttx/wdog.h>
-#include <nuttx/pthread.h>
+#include <nuttx/cancelpt.h>
 
 #include "sched/sched.h"
 #include "signal/signal.h"

sched/signal/sig_waitinfo.c

@@ -41,7 +41,7 @@
 
 #include <signal.h>
 
-#include <nuttx/pthread.h>
+#include <nuttx/cancelpt.h>
 
 /****************************************************************************
  * Public Functions

sched/task/task_cancelpt.c

@@ -71,7 +71,7 @@
 #include <errno.h>
 
 #include <nuttx/irq.h>
-#include <nuttx/pthread.h>
+#include <nuttx/cancelpt.h>
 
 #include "sched/sched.h"
 #include "semaphore/semaphore.h"