[rtems commit] posix: Create pthread implementation header

Sebastian Huber sebh at rtems.org
Mon Jul 22 14:51:43 UTC 2013


Module:    rtems
Branch:    master
Commit:    0c5317d16c309dd1075c469b8ce661ab6806b724
Changeset: http://git.rtems.org/rtems/commit/?id=0c5317d16c309dd1075c469b8ce661ab6806b724

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Fri Jul 19 14:33:56 2013 +0200

posix: Create pthread implementation header

Move implementation specific parts of pthread.h and pthread.inl into new
header file pthreadimpl.h.  The pthread.h contains now only the
application visible API.

---

 cpukit/libcsupport/src/resource_snapshot.c     |    2 +-
 cpukit/libgnat/adasupp.c                       |    2 +-
 cpukit/libmisc/monitor/mon-object.c            |    2 +-
 cpukit/posix/Makefile.am                       |    2 +-
 cpukit/posix/include/rtems/posix/pthread.h     |  149 +---------------
 cpukit/posix/include/rtems/posix/pthreadimpl.h |  229 ++++++++++++++++++++++++
 cpukit/posix/inline/rtems/posix/pthread.inl    |   72 --------
 cpukit/posix/preinstall.am                     |    8 +-
 cpukit/posix/src/alarm.c                       |    2 +-
 cpukit/posix/src/cancel.c                      |    2 +-
 cpukit/posix/src/canceleval.c                  |    2 +-
 cpukit/posix/src/cancelrun.c                   |    2 +-
 cpukit/posix/src/cleanuppop.c                  |    2 +-
 cpukit/posix/src/cleanuppush.c                 |    2 +-
 cpukit/posix/src/kill.c                        |    2 +-
 cpukit/posix/src/kill_r.c                      |    2 +-
 cpukit/posix/src/killinfo.c                    |    2 +-
 cpukit/posix/src/psignal.c                     |    2 +-
 cpukit/posix/src/psignalchecksignal.c          |    2 +-
 cpukit/posix/src/psignalclearprocesssignals.c  |    2 +-
 cpukit/posix/src/psignalclearsignals.c         |    2 +-
 cpukit/posix/src/psignalsetprocesssignals.c    |    2 +-
 cpukit/posix/src/psignalunblockthread.c        |    2 +-
 cpukit/posix/src/psxtransschedparam.c          |    2 +-
 cpukit/posix/src/pthread.c                     |    2 +-
 cpukit/posix/src/pthreadattrinit.c             |    2 +-
 cpukit/posix/src/pthreadattrsetguardsize.c     |    2 +-
 cpukit/posix/src/pthreadattrsetinheritsched.c  |    2 +-
 cpukit/posix/src/pthreadattrsetschedpolicy.c   |    2 +-
 cpukit/posix/src/pthreadattrsetscope.c         |    2 +-
 cpukit/posix/src/pthreadattrsetstack.c         |    2 +-
 cpukit/posix/src/pthreadattrsetstacksize.c     |    2 +-
 cpukit/posix/src/pthreadcreate.c               |    2 +-
 cpukit/posix/src/pthreaddetach.c               |    2 +-
 cpukit/posix/src/pthreadequal.c                |    2 +-
 cpukit/posix/src/pthreadexit.c                 |    2 +-
 cpukit/posix/src/pthreadgetschedparam.c        |    2 +-
 cpukit/posix/src/pthreadinitthreads.c          |    2 +-
 cpukit/posix/src/pthreadjoin.c                 |    2 +-
 cpukit/posix/src/pthreadkill.c                 |    2 +-
 cpukit/posix/src/pthreadsetschedparam.c        |    2 +-
 cpukit/posix/src/pthreadsigmask.c              |    2 +-
 cpukit/posix/src/setcancelstate.c              |    2 +-
 cpukit/posix/src/setcanceltype.c               |    2 +-
 cpukit/posix/src/sigaction.c                   |    2 +-
 cpukit/posix/src/sigpending.c                  |    2 +-
 cpukit/posix/src/sigqueue.c                    |    2 +-
 cpukit/posix/src/sigtimedwait.c                |    2 +-
 cpukit/posix/src/testcancel.c                  |    2 +-
 cpukit/posix/src/ualarm.c                      |    2 +-
 cpukit/sapi/src/posixapi.c                     |    2 +-
 testsuites/psxtests/psxstack01/init.c          |    2 +-
 testsuites/psxtests/psxstack02/init.c          |    2 +-
 53 files changed, 284 insertions(+), 272 deletions(-)

diff --git a/cpukit/libcsupport/src/resource_snapshot.c b/cpukit/libcsupport/src/resource_snapshot.c
index e7de01d..d3f162f 100644
--- a/cpukit/libcsupport/src/resource_snapshot.c
+++ b/cpukit/libcsupport/src/resource_snapshot.c
@@ -36,7 +36,7 @@
   #include <rtems/posix/muteximpl.h>
   #include <rtems/posix/key.h>
   #include <rtems/posix/psignal.h>
-  #include <rtems/posix/pthread.h>
+  #include <rtems/posix/pthreadimpl.h>
   #include <rtems/posix/rwlock.h>
   #include <rtems/posix/semaphoreimpl.h>
   #include <rtems/posix/spinlock.h>
diff --git a/cpukit/libgnat/adasupp.c b/cpukit/libgnat/adasupp.c
index 13924d5..a6e1f38 100644
--- a/cpukit/libgnat/adasupp.c
+++ b/cpukit/libgnat/adasupp.c
@@ -7,7 +7,7 @@
 
 #include <rtems/system.h>
 #include <rtems/config.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 
 /*
  *  _ada_pthread_minimum_stack_size
diff --git a/cpukit/libmisc/monitor/mon-object.c b/cpukit/libmisc/monitor/mon-object.c
index 6e55012..6cdf597 100644
--- a/cpukit/libmisc/monitor/mon-object.c
+++ b/cpukit/libmisc/monitor/mon-object.c
@@ -23,7 +23,7 @@
 #include <rtems/rtems/messageimpl.h>
 #include <rtems/rtems/semimpl.h>
 #if defined(RTEMS_POSIX_API)
-  #include <rtems/posix/pthread.h>
+  #include <rtems/posix/pthreadimpl.h>
 #endif
 
 #include <stdio.h>
diff --git a/cpukit/posix/Makefile.am b/cpukit/posix/Makefile.am
index c4e6685..f378209 100644
--- a/cpukit/posix/Makefile.am
+++ b/cpukit/posix/Makefile.am
@@ -39,6 +39,7 @@ include_rtems_posix_HEADERS += include/rtems/posix/priorityimpl.h
 include_rtems_posix_HEADERS += include/rtems/posix/psignal.h
 include_rtems_posix_HEADERS += include/rtems/posix/psignalimpl.h
 include_rtems_posix_HEADERS += include/rtems/posix/pthread.h
+include_rtems_posix_HEADERS += include/rtems/posix/pthreadimpl.h
 include_rtems_posix_HEADERS += include/rtems/posix/ptimer.h
 include_rtems_posix_HEADERS += include/rtems/posix/semaphore.h
 include_rtems_posix_HEADERS += include/rtems/posix/semaphoreimpl.h
@@ -51,7 +52,6 @@ include_rtems_posix_HEADERS += include/rtems/posix/rwlock.h
 include_rtems_posix_HEADERS += include/rtems/posix/spinlock.h
 
 include_rtems_posix_HEADERS += inline/rtems/posix/key.inl
-include_rtems_posix_HEADERS += inline/rtems/posix/pthread.inl
 include_rtems_posix_HEADERS += inline/rtems/posix/timer.inl
 include_rtems_posix_HEADERS += inline/rtems/posix/rwlock.inl
 include_rtems_posix_HEADERS += inline/rtems/posix/spinlock.inl
diff --git a/cpukit/posix/include/rtems/posix/pthread.h b/cpukit/posix/include/rtems/posix/pthread.h
index 0f495fa..3c210f5 100644
--- a/cpukit/posix/include/rtems/posix/pthread.h
+++ b/cpukit/posix/include/rtems/posix/pthread.h
@@ -1,6 +1,6 @@
 /**
  * @file
- * 
+ *
  * @brief POSIX Threads Private Support
  *
  * This include file contains all the private support information for
@@ -19,7 +19,6 @@
 #ifndef _RTEMS_POSIX_PTHREAD_H
 #define _RTEMS_POSIX_PTHREAD_H
 
-
 #include <rtems/posix/config.h>
 #include <rtems/posix/threadsup.h>
 #include <rtems/score/thread.h>
@@ -34,151 +33,9 @@ extern "C" {
  * @ingroup POSIXAPI
  *
  * @brief Private Support Information for POSIX Threads
- * 
- */
-/**@{**/
-
-/**
- * The following sets the minimum stack size for POSIX threads.
- */
-#define PTHREAD_MINIMUM_STACK_SIZE (_Stack_Minimum() * 2)
-
-/**
- * The following defines the information control block used to manage
- * this class of objects.
- */
-POSIX_EXTERN Objects_Information  _POSIX_Threads_Information;
-
-/**
- * This variable contains the default POSIX Thread attributes.
- */
-extern const pthread_attr_t _POSIX_Threads_Default_attributes;
-
-/**
- * When the user configures a set of POSIX API initialization threads,
- * This variable will point to the method used to initialize them.
- *
- * NOTE: It is instantiated and initialized by confdefs.h based upon
- *       application requirements.
- */
-extern void (*_POSIX_Threads_Initialize_user_threads_p)(void);
-
-/**
- * @brief POSIX threads manager initialization.
- *
- * This routine performs the initialization necessary for this manager.
- */
-void _POSIX_Threads_Manager_initialization(void);
-
-/**
- * @brief Allocate POSIX thread control block.
- *
- * This function allocates a pthread control block from
- * the inactive chain of free pthread control blocks.
- *
- * @return This method returns a newly allocated thread.
- */
-RTEMS_INLINE_ROUTINE Thread_Control *_POSIX_Threads_Allocate( void );
-
-/**
- * @brief Free POSIX control block.
- *
- * This routine frees a pthread control block to the
- * inactive chain of free pthread control blocks.
  *
- * @param[in] the_pthread is a pointer to the thread to free.
  */
-RTEMS_INLINE_ROUTINE void _POSIX_Threads_Free(
-  Thread_Control *the_pthread
-);
-
-/**
- * @brief Map POSIX thread IDs to control blocks.
- *
- * This function maps pthread IDs to pthread control blocks.
- * If ID corresponds to a local pthread, then it returns
- * the_pthread control pointer which maps to ID and location
- * is set to OBJECTS_LOCAL.  if the pthread ID is global and
- * resides on a remote node, then location is set to OBJECTS_REMOTE,
- * and the_pthread is undefined.  Otherwise, location is set
- * to OBJECTS_ERROR and the_pthread is undefined.
- *
- * @param[in] id is the id to lookup
- * @param[in] location points to the returned location value
- *
- * @return This methods returns a pointer to the corresponding Thread_Control.
- */
-RTEMS_INLINE_ROUTINE Thread_Control *_POSIX_Threads_Get(
-  pthread_t          id,
-  Objects_Locations *location
-);
-
-/**
- * @brief Check if a POSIX thread control block is NULL.
- *
- * This function returns @c TRUE if the_pthread is @c NULL and @c FALSE
- * otherwise.
- *
- * @param[in] the_pthread is a pointer to the POSIX thread control block 
- * to check.
- *
- * @retval TRUE The thread control block is @c NULL.
- * @retval FALSE The thread control block is not @c NULL.
- */
-RTEMS_INLINE_ROUTINE bool _POSIX_Threads_Is_null(
-  Thread_Control *the_pthread
-);
-
-/**
- * @brief POSIX threads sporadic budget callout.
- *
- * This routine handles the sporadic scheduling algorithm.
- *
- * @param[in] the_thread is a pointer to the thread whose budget
- * has been exceeded.
- */
-void _POSIX_Threads_Sporadic_budget_callout(
-  Thread_Control *the_thread
-);
-
-/**
- * This routine supports the sporadic scheduling algorithm.  It
- * is scheduled to be executed at the end of each replenishment
- * period.  In sporadic scheduling a thread will execute at a
- * high priority for a user specified amount of CPU time.  When
- * it exceeds that amount of CPU time, its priority is automatically
- * lowered. This TSR is executed when it is time to replenish
- * the thread's processor budget and raise its priority.
- *
- * @param[in] id is ignored
- * @param[in] argument is a pointer to the Thread_Control structure
- *            for the thread being replenished.
- */
-void _POSIX_Threads_Sporadic_budget_TSR(
-  Objects_Id      id,
-  void           *argument
-);
-
-/**
- * @brief Translate sched_param into SuperCore terms.
- *
- * This method translates the POSIX API sched_param into the corresponding
- * SuperCore settings.
- *
- * @param[in] policy is the POSIX scheduling policy
- * @param[in] param points to the scheduling parameter structure
- * @param[in] budget_algorithm points to the output CPU Budget algorithm
- * @param[in] budget_callout points to the output CPU Callout
- *
- * @retval 0 Indicates success.
- * @retval error_code POSIX error code indicating failure.
- */
-int _POSIX_Thread_Translate_sched_param(
-  int                                  policy,
-  struct sched_param                  *param,
-  Thread_CPU_budget_algorithms        *budget_algorithm,
-  Thread_CPU_budget_algorithm_callout *budget_callout
-);
+/**@{**/
 
 /**
  * @brief POSIX threads initialize user threads body.
@@ -188,8 +45,6 @@ int _POSIX_Thread_Translate_sched_param(
  */
 extern void _POSIX_Threads_Initialize_user_threads_body(void);
 
-#include <rtems/posix/pthread.inl>
-
 /** @} */
 
 #ifdef __cplusplus
diff --git a/cpukit/posix/include/rtems/posix/pthreadimpl.h b/cpukit/posix/include/rtems/posix/pthreadimpl.h
new file mode 100644
index 0000000..1231f01
--- /dev/null
+++ b/cpukit/posix/include/rtems/posix/pthreadimpl.h
@@ -0,0 +1,229 @@
+/**
+ * @file
+ *
+ * @brief POSIX Threads Private Support
+ *
+ * This include file contains all the private support information for
+ * POSIX threads.
+ */
+
+/*
+ *  COPYRIGHT (c) 1989-2011.
+ *  On-Line Applications Research Corporation (OAR).
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.rtems.com/license/LICENSE.
+ */
+
+#ifndef _RTEMS_POSIX_PTHREADIMPL_H
+#define _RTEMS_POSIX_PTHREADIMPL_H
+
+#include <rtems/posix/pthread.h>
+#include <rtems/posix/config.h>
+#include <rtems/posix/threadsup.h>
+#include <rtems/score/thread.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @addtogroup POSIX_PTHREAD
+ */
+/**@{**/
+
+/**
+ * The following sets the minimum stack size for POSIX threads.
+ */
+#define PTHREAD_MINIMUM_STACK_SIZE (_Stack_Minimum() * 2)
+
+/**
+ * The following defines the information control block used to manage
+ * this class of objects.
+ */
+POSIX_EXTERN Objects_Information  _POSIX_Threads_Information;
+
+/**
+ * This variable contains the default POSIX Thread attributes.
+ */
+extern const pthread_attr_t _POSIX_Threads_Default_attributes;
+
+/**
+ * When the user configures a set of POSIX API initialization threads,
+ * This variable will point to the method used to initialize them.
+ *
+ * NOTE: It is instantiated and initialized by confdefs.h based upon
+ *       application requirements.
+ */
+extern void (*_POSIX_Threads_Initialize_user_threads_p)(void);
+
+/**
+ * @brief POSIX threads manager initialization.
+ *
+ * This routine performs the initialization necessary for this manager.
+ */
+void _POSIX_Threads_Manager_initialization(void);
+
+/**
+ * @brief Allocate POSIX thread control block.
+ *
+ * This function allocates a pthread control block from
+ * the inactive chain of free pthread control blocks.
+ *
+ * @return This method returns a newly allocated thread.
+ */
+RTEMS_INLINE_ROUTINE Thread_Control *_POSIX_Threads_Allocate( void );
+
+/**
+ * @brief Free POSIX control block.
+ *
+ * This routine frees a pthread control block to the
+ * inactive chain of free pthread control blocks.
+ *
+ * @param[in] the_pthread is a pointer to the thread to free.
+ */
+RTEMS_INLINE_ROUTINE void _POSIX_Threads_Free(
+  Thread_Control *the_pthread
+);
+
+/**
+ * @brief Map POSIX thread IDs to control blocks.
+ *
+ * This function maps pthread IDs to pthread control blocks.
+ * If ID corresponds to a local pthread, then it returns
+ * the_pthread control pointer which maps to ID and location
+ * is set to OBJECTS_LOCAL.  if the pthread ID is global and
+ * resides on a remote node, then location is set to OBJECTS_REMOTE,
+ * and the_pthread is undefined.  Otherwise, location is set
+ * to OBJECTS_ERROR and the_pthread is undefined.
+ *
+ * @param[in] id is the id to lookup
+ * @param[in] location points to the returned location value
+ *
+ * @return This methods returns a pointer to the corresponding Thread_Control.
+ */
+RTEMS_INLINE_ROUTINE Thread_Control *_POSIX_Threads_Get(
+  pthread_t          id,
+  Objects_Locations *location
+);
+
+/**
+ * @brief Check if a POSIX thread control block is NULL.
+ *
+ * This function returns @c TRUE if the_pthread is @c NULL and @c FALSE
+ * otherwise.
+ *
+ * @param[in] the_pthread is a pointer to the POSIX thread control block
+ * to check.
+ *
+ * @retval TRUE The thread control block is @c NULL.
+ * @retval FALSE The thread control block is not @c NULL.
+ */
+RTEMS_INLINE_ROUTINE bool _POSIX_Threads_Is_null(
+  Thread_Control *the_pthread
+);
+
+/**
+ * @brief POSIX threads sporadic budget callout.
+ *
+ * This routine handles the sporadic scheduling algorithm.
+ *
+ * @param[in] the_thread is a pointer to the thread whose budget
+ * has been exceeded.
+ */
+void _POSIX_Threads_Sporadic_budget_callout(
+  Thread_Control *the_thread
+);
+
+/**
+ * This routine supports the sporadic scheduling algorithm.  It
+ * is scheduled to be executed at the end of each replenishment
+ * period.  In sporadic scheduling a thread will execute at a
+ * high priority for a user specified amount of CPU time.  When
+ * it exceeds that amount of CPU time, its priority is automatically
+ * lowered. This TSR is executed when it is time to replenish
+ * the thread's processor budget and raise its priority.
+ *
+ * @param[in] id is ignored
+ * @param[in] argument is a pointer to the Thread_Control structure
+ *            for the thread being replenished.
+ */
+void _POSIX_Threads_Sporadic_budget_TSR(
+  Objects_Id      id,
+  void           *argument
+);
+
+/**
+ * @brief Translate sched_param into SuperCore terms.
+ *
+ * This method translates the POSIX API sched_param into the corresponding
+ * SuperCore settings.
+ *
+ * @param[in] policy is the POSIX scheduling policy
+ * @param[in] param points to the scheduling parameter structure
+ * @param[in] budget_algorithm points to the output CPU Budget algorithm
+ * @param[in] budget_callout points to the output CPU Callout
+ *
+ * @retval 0 Indicates success.
+ * @retval error_code POSIX error code indicating failure.
+ */
+int _POSIX_Thread_Translate_sched_param(
+  int                                  policy,
+  struct sched_param                  *param,
+  Thread_CPU_budget_algorithms        *budget_algorithm,
+  Thread_CPU_budget_algorithm_callout *budget_callout
+);
+
+/*
+ *  _POSIX_Threads_Allocate
+ */
+
+RTEMS_INLINE_ROUTINE Thread_Control *_POSIX_Threads_Allocate( void )
+{
+  return (Thread_Control *) _Objects_Allocate( &_POSIX_Threads_Information );
+}
+
+/*
+ *  _POSIX_Threads_Free
+ */
+
+RTEMS_INLINE_ROUTINE void _POSIX_Threads_Free (
+  Thread_Control *the_pthread
+)
+{
+  _Objects_Free( &_POSIX_Threads_Information, &the_pthread->Object );
+}
+
+/*
+ *  _POSIX_Threads_Get
+ */
+
+RTEMS_INLINE_ROUTINE Thread_Control *_POSIX_Threads_Get (
+  pthread_t          id,
+  Objects_Locations *location
+)
+{
+  return (Thread_Control *)
+    _Objects_Get( &_POSIX_Threads_Information, (Objects_Id)id, location );
+}
+
+/*
+ *  _POSIX_Threads_Is_null
+ */
+
+RTEMS_INLINE_ROUTINE bool _POSIX_Threads_Is_null (
+  Thread_Control *the_pthread
+)
+{
+  return !the_pthread;
+}
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+/*  end of include file */
diff --git a/cpukit/posix/inline/rtems/posix/pthread.inl b/cpukit/posix/inline/rtems/posix/pthread.inl
deleted file mode 100644
index 2df4980..0000000
--- a/cpukit/posix/inline/rtems/posix/pthread.inl
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * @file
- * 
- * @brief Private Inlined Routines for POSIX Threads
- *
- * This include file contains the static inline implementation of the private 
- * inlined routines for POSIX threads.
- */
-
-/*
- *  COPYRIGHT (c) 1989-2011.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.com/license/LICENSE.
- */
- 
-#ifndef _RTEMS_POSIX_PTHREAD_H
-# error "Never use <rtems/posix/pthread.inl> directly; include <rtems/posix/pthread.h> instead."
-#endif
-
-#ifndef _RTEMS_POSIX_PTHREAD_INL
-#define _RTEMS_POSIX_PTHREAD_INL
- 
-/*
- *  _POSIX_Threads_Allocate
- */
- 
-RTEMS_INLINE_ROUTINE Thread_Control *_POSIX_Threads_Allocate( void )
-{
-  return (Thread_Control *) _Objects_Allocate( &_POSIX_Threads_Information );
-}
- 
-/*
- *  _POSIX_Threads_Free
- */
- 
-RTEMS_INLINE_ROUTINE void _POSIX_Threads_Free (
-  Thread_Control *the_pthread
-)
-{
-  _Objects_Free( &_POSIX_Threads_Information, &the_pthread->Object );
-}
- 
-/*
- *  _POSIX_Threads_Get
- */
- 
-RTEMS_INLINE_ROUTINE Thread_Control *_POSIX_Threads_Get (
-  pthread_t          id,
-  Objects_Locations *location
-)
-{
-  return (Thread_Control *)
-    _Objects_Get( &_POSIX_Threads_Information, (Objects_Id)id, location );
-}
- 
-/*
- *  _POSIX_Threads_Is_null
- */
- 
-RTEMS_INLINE_ROUTINE bool _POSIX_Threads_Is_null (
-  Thread_Control *the_pthread
-)
-{
-  return !the_pthread;
-}
-
-#endif
-/*  end of include file */
-
diff --git a/cpukit/posix/preinstall.am b/cpukit/posix/preinstall.am
index 4548628..2cb9261 100644
--- a/cpukit/posix/preinstall.am
+++ b/cpukit/posix/preinstall.am
@@ -100,6 +100,10 @@ $(PROJECT_INCLUDE)/rtems/posix/pthread.h: include/rtems/posix/pthread.h $(PROJEC
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/pthread.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/pthread.h
 
+$(PROJECT_INCLUDE)/rtems/posix/pthreadimpl.h: include/rtems/posix/pthreadimpl.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/pthreadimpl.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/pthreadimpl.h
+
 $(PROJECT_INCLUDE)/rtems/posix/ptimer.h: include/rtems/posix/ptimer.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/ptimer.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/ptimer.h
@@ -144,10 +148,6 @@ $(PROJECT_INCLUDE)/rtems/posix/key.inl: inline/rtems/posix/key.inl $(PROJECT_INC
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/key.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/key.inl
 
-$(PROJECT_INCLUDE)/rtems/posix/pthread.inl: inline/rtems/posix/pthread.inl $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/pthread.inl
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/pthread.inl
-
 $(PROJECT_INCLUDE)/rtems/posix/timer.inl: inline/rtems/posix/timer.inl $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/timer.inl
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/timer.inl
diff --git a/cpukit/posix/src/alarm.c b/cpukit/posix/src/alarm.c
index 5130b01..98edcb7 100644
--- a/cpukit/posix/src/alarm.c
+++ b/cpukit/posix/src/alarm.c
@@ -24,7 +24,7 @@
 #include <pthread.h>
 
 #include <rtems/system.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 #include <rtems/posix/psignalimpl.h>
 
 /*
diff --git a/cpukit/posix/src/cancel.c b/cpukit/posix/src/cancel.c
index 77ccf8c..9ea7f93 100644
--- a/cpukit/posix/src/cancel.c
+++ b/cpukit/posix/src/cancel.c
@@ -27,7 +27,7 @@
 #include <rtems/score/thread.h>
 #include <rtems/score/wkspace.h>
 #include <rtems/posix/cancel.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 #include <rtems/posix/threadsup.h>
 
 /*
diff --git a/cpukit/posix/src/canceleval.c b/cpukit/posix/src/canceleval.c
index 2501b7d..caa3d5d 100644
--- a/cpukit/posix/src/canceleval.c
+++ b/cpukit/posix/src/canceleval.c
@@ -22,7 +22,7 @@
 #include <rtems/system.h>
 #include <rtems/score/thread.h>
 #include <rtems/posix/cancel.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 
 void _POSIX_Thread_Evaluate_cancellation_and_enable_dispatch(
   Thread_Control    *the_thread
diff --git a/cpukit/posix/src/cancelrun.c b/cpukit/posix/src/cancelrun.c
index 2d73bda..20132e1 100644
--- a/cpukit/posix/src/cancelrun.c
+++ b/cpukit/posix/src/cancelrun.c
@@ -27,7 +27,7 @@
 #include <rtems/score/thread.h>
 #include <rtems/score/wkspace.h>
 #include <rtems/posix/cancel.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 #include <rtems/posix/threadsup.h>
 
 void _POSIX_Threads_cancel_run(
diff --git a/cpukit/posix/src/cleanuppop.c b/cpukit/posix/src/cleanuppop.c
index bbadec5..5ca4763 100644
--- a/cpukit/posix/src/cleanuppop.c
+++ b/cpukit/posix/src/cleanuppop.c
@@ -27,7 +27,7 @@
 #include <rtems/score/thread.h>
 #include <rtems/score/wkspace.h>
 #include <rtems/posix/cancel.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 #include <rtems/posix/threadsup.h>
 
 /*
diff --git a/cpukit/posix/src/cleanuppush.c b/cpukit/posix/src/cleanuppush.c
index 4fb82c2..f27ab79 100644
--- a/cpukit/posix/src/cleanuppush.c
+++ b/cpukit/posix/src/cleanuppush.c
@@ -27,7 +27,7 @@
 #include <rtems/score/thread.h>
 #include <rtems/score/wkspace.h>
 #include <rtems/posix/cancel.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 #include <rtems/posix/threadsup.h>
 
 /*
diff --git a/cpukit/posix/src/kill.c b/cpukit/posix/src/kill.c
index cf60cac..9e4dacb 100644
--- a/cpukit/posix/src/kill.c
+++ b/cpukit/posix/src/kill.c
@@ -22,7 +22,7 @@
 #include <errno.h>
 
 #include <rtems/system.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 #include <rtems/posix/psignalimpl.h>
 
 int kill(
diff --git a/cpukit/posix/src/kill_r.c b/cpukit/posix/src/kill_r.c
index 57f5c24..5f603e2 100644
--- a/cpukit/posix/src/kill_r.c
+++ b/cpukit/posix/src/kill_r.c
@@ -24,7 +24,7 @@
 #include <errno.h>
 
 #include <rtems/system.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 #include <rtems/posix/psignalimpl.h>
 
 #if defined(RTEMS_NEWLIB)
diff --git a/cpukit/posix/src/killinfo.c b/cpukit/posix/src/killinfo.c
index f386757..98fbf1e 100644
--- a/cpukit/posix/src/killinfo.c
+++ b/cpukit/posix/src/killinfo.c
@@ -25,7 +25,7 @@
 #include <errno.h>
 
 #include <rtems/system.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 #include <rtems/posix/psignalimpl.h>
 #include <rtems/seterr.h>
 #include <rtems/score/isr.h>
diff --git a/cpukit/posix/src/psignal.c b/cpukit/posix/src/psignal.c
index eeee127..0f0c5e7 100644
--- a/cpukit/posix/src/psignal.c
+++ b/cpukit/posix/src/psignal.c
@@ -36,7 +36,7 @@
 #include <rtems/seterr.h>
 #include <rtems/posix/threadsup.h>
 #include <rtems/posix/psignalimpl.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 #include <rtems/posix/time.h>
 #include <stdio.h>
 
diff --git a/cpukit/posix/src/psignalchecksignal.c b/cpukit/posix/src/psignalchecksignal.c
index 82fcb62..53a4632 100644
--- a/cpukit/posix/src/psignalchecksignal.c
+++ b/cpukit/posix/src/psignalchecksignal.c
@@ -34,7 +34,7 @@
 #include <rtems/seterr.h>
 #include <rtems/posix/threadsup.h>
 #include <rtems/posix/psignalimpl.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 #include <rtems/posix/time.h>
 #include <stdio.h>
 
diff --git a/cpukit/posix/src/psignalclearprocesssignals.c b/cpukit/posix/src/psignalclearprocesssignals.c
index b16398c..429a3ed 100644
--- a/cpukit/posix/src/psignalclearprocesssignals.c
+++ b/cpukit/posix/src/psignalclearprocesssignals.c
@@ -30,7 +30,7 @@
 #include <rtems/seterr.h>
 #include <rtems/posix/threadsup.h>
 #include <rtems/posix/psignalimpl.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 #include <rtems/posix/time.h>
 #include <stdio.h>
 
diff --git a/cpukit/posix/src/psignalclearsignals.c b/cpukit/posix/src/psignalclearsignals.c
index e71f2fa..90bd503 100644
--- a/cpukit/posix/src/psignalclearsignals.c
+++ b/cpukit/posix/src/psignalclearsignals.c
@@ -30,7 +30,7 @@
 #include <rtems/seterr.h>
 #include <rtems/posix/threadsup.h>
 #include <rtems/posix/psignalimpl.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 #include <rtems/posix/time.h>
 #include <stdio.h>
 
diff --git a/cpukit/posix/src/psignalsetprocesssignals.c b/cpukit/posix/src/psignalsetprocesssignals.c
index 92c1d81..122e2f2 100644
--- a/cpukit/posix/src/psignalsetprocesssignals.c
+++ b/cpukit/posix/src/psignalsetprocesssignals.c
@@ -30,7 +30,7 @@
 #include <rtems/seterr.h>
 #include <rtems/posix/threadsup.h>
 #include <rtems/posix/psignalimpl.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 #include <rtems/posix/time.h>
 #include <stdio.h>
 
diff --git a/cpukit/posix/src/psignalunblockthread.c b/cpukit/posix/src/psignalunblockthread.c
index b46f8a4..34816fa 100644
--- a/cpukit/posix/src/psignalunblockthread.c
+++ b/cpukit/posix/src/psignalunblockthread.c
@@ -30,7 +30,7 @@
 #include <rtems/seterr.h>
 #include <rtems/posix/threadsup.h>
 #include <rtems/posix/psignalimpl.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 #include <rtems/posix/time.h>
 #include <stdio.h>
 
diff --git a/cpukit/posix/src/psxtransschedparam.c b/cpukit/posix/src/psxtransschedparam.c
index e528aca..6e01aa1 100644
--- a/cpukit/posix/src/psxtransschedparam.c
+++ b/cpukit/posix/src/psxtransschedparam.c
@@ -22,7 +22,7 @@
 #include <errno.h>
 
 #include <rtems/system.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 #include <rtems/posix/priorityimpl.h>
 #include <rtems/posix/time.h>
 
diff --git a/cpukit/posix/src/pthread.c b/cpukit/posix/src/pthread.c
index 1aa64c7..a82b036 100644
--- a/cpukit/posix/src/pthread.c
+++ b/cpukit/posix/src/pthread.c
@@ -31,7 +31,7 @@
 #include <rtems/score/userextimpl.h>
 #include <rtems/score/wkspace.h>
 #include <rtems/posix/cancel.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 #include <rtems/posix/priorityimpl.h>
 #include <rtems/posix/psignalimpl.h>
 #include <rtems/posix/config.h>
diff --git a/cpukit/posix/src/pthreadattrinit.c b/cpukit/posix/src/pthreadattrinit.c
index dd3f222..cf0ecab 100644
--- a/cpukit/posix/src/pthreadattrinit.c
+++ b/cpukit/posix/src/pthreadattrinit.c
@@ -22,7 +22,7 @@
 #include <errno.h>
 
 #include <rtems/system.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 
 /**
  * 16.1.1 Thread Creation Attributes, P1003.1c/Draft 10, p, 140
diff --git a/cpukit/posix/src/pthreadattrsetguardsize.c b/cpukit/posix/src/pthreadattrsetguardsize.c
index f6df578..5b41994 100644
--- a/cpukit/posix/src/pthreadattrsetguardsize.c
+++ b/cpukit/posix/src/pthreadattrsetguardsize.c
@@ -23,7 +23,7 @@
 #include <errno.h>
 
 #include <rtems/system.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 
 int pthread_attr_setguardsize(
   pthread_attr_t  *attr,
diff --git a/cpukit/posix/src/pthreadattrsetinheritsched.c b/cpukit/posix/src/pthreadattrsetinheritsched.c
index 8f414ab..0f15a0a 100644
--- a/cpukit/posix/src/pthreadattrsetinheritsched.c
+++ b/cpukit/posix/src/pthreadattrsetinheritsched.c
@@ -24,7 +24,7 @@
 #include <errno.h>
 
 #include <rtems/system.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 
 int pthread_attr_setinheritsched(
   pthread_attr_t  *attr,
diff --git a/cpukit/posix/src/pthreadattrsetschedpolicy.c b/cpukit/posix/src/pthreadattrsetschedpolicy.c
index 4b4187e..434658f 100644
--- a/cpukit/posix/src/pthreadattrsetschedpolicy.c
+++ b/cpukit/posix/src/pthreadattrsetschedpolicy.c
@@ -24,7 +24,7 @@
 #include <errno.h>
 
 #include <rtems/system.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 
 int pthread_attr_setschedpolicy(
   pthread_attr_t  *attr,
diff --git a/cpukit/posix/src/pthreadattrsetscope.c b/cpukit/posix/src/pthreadattrsetscope.c
index db2c931..fec4fe4 100644
--- a/cpukit/posix/src/pthreadattrsetscope.c
+++ b/cpukit/posix/src/pthreadattrsetscope.c
@@ -24,7 +24,7 @@
 #include <errno.h>
 
 #include <rtems/system.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 
 int pthread_attr_setscope(
   pthread_attr_t  *attr,
diff --git a/cpukit/posix/src/pthreadattrsetstack.c b/cpukit/posix/src/pthreadattrsetstack.c
index e512c16..7c4f14b 100644
--- a/cpukit/posix/src/pthreadattrsetstack.c
+++ b/cpukit/posix/src/pthreadattrsetstack.c
@@ -25,7 +25,7 @@
 #include <errno.h>
 
 #include <rtems/system.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 
 int pthread_attr_setstack(
   pthread_attr_t  *attr,
diff --git a/cpukit/posix/src/pthreadattrsetstacksize.c b/cpukit/posix/src/pthreadattrsetstacksize.c
index 313034c..3fd78b3 100644
--- a/cpukit/posix/src/pthreadattrsetstacksize.c
+++ b/cpukit/posix/src/pthreadattrsetstacksize.c
@@ -24,7 +24,7 @@
 #include <errno.h>
 
 #include <rtems/system.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 
 int pthread_attr_setstacksize(
   pthread_attr_t  *attr,
diff --git a/cpukit/posix/src/pthreadcreate.c b/cpukit/posix/src/pthreadcreate.c
index 78e77ac..0414fd7 100644
--- a/cpukit/posix/src/pthreadcreate.c
+++ b/cpukit/posix/src/pthreadcreate.c
@@ -26,7 +26,7 @@
 
 #include <rtems/system.h>
 #include <rtems/score/thread.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 #include <rtems/posix/priorityimpl.h>
 #include <rtems/posix/time.h>
 #include <rtems/score/apimutex.h>
diff --git a/cpukit/posix/src/pthreaddetach.c b/cpukit/posix/src/pthreaddetach.c
index 52a42f6..3b99a9c 100644
--- a/cpukit/posix/src/pthreaddetach.c
+++ b/cpukit/posix/src/pthreaddetach.c
@@ -23,7 +23,7 @@
 
 #include <rtems/system.h>
 #include <rtems/score/thread.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 
 /**
  * 16.1.4 Detaching a Thread, P1003.1c/Draft 10, p. 149
diff --git a/cpukit/posix/src/pthreadequal.c b/cpukit/posix/src/pthreadequal.c
index 9b2b028..f398e5c 100644
--- a/cpukit/posix/src/pthreadequal.c
+++ b/cpukit/posix/src/pthreadequal.c
@@ -24,7 +24,7 @@
 #include <errno.h>
 
 #include <rtems/system.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 #include <rtems/score/thread.h>
 
 int pthread_equal(
diff --git a/cpukit/posix/src/pthreadexit.c b/cpukit/posix/src/pthreadexit.c
index 3b3f0bd..03a56c9 100644
--- a/cpukit/posix/src/pthreadexit.c
+++ b/cpukit/posix/src/pthreadexit.c
@@ -24,7 +24,7 @@
 #include <rtems/system.h>
 #include <rtems/score/apimutex.h>
 #include <rtems/score/thread.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 
 
 void _POSIX_Thread_Exit(
diff --git a/cpukit/posix/src/pthreadgetschedparam.c b/cpukit/posix/src/pthreadgetschedparam.c
index 0060682..7f034cb 100644
--- a/cpukit/posix/src/pthreadgetschedparam.c
+++ b/cpukit/posix/src/pthreadgetschedparam.c
@@ -25,7 +25,7 @@
 #include <errno.h>
 
 #include <rtems/system.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 #include <rtems/posix/priorityimpl.h>
 
 int pthread_getschedparam(
diff --git a/cpukit/posix/src/pthreadinitthreads.c b/cpukit/posix/src/pthreadinitthreads.c
index df92c2e..9f2f468 100644
--- a/cpukit/posix/src/pthreadinitthreads.c
+++ b/cpukit/posix/src/pthreadinitthreads.c
@@ -29,7 +29,7 @@
 #include <rtems/score/thread.h>
 #include <rtems/score/wkspace.h>
 #include <rtems/posix/cancel.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 #include <rtems/posix/priorityimpl.h>
 #include <rtems/posix/config.h>
 #include <rtems/posix/key.h>
diff --git a/cpukit/posix/src/pthreadjoin.c b/cpukit/posix/src/pthreadjoin.c
index cbc6e17..0ee700a 100644
--- a/cpukit/posix/src/pthreadjoin.c
+++ b/cpukit/posix/src/pthreadjoin.c
@@ -24,7 +24,7 @@
 #include <errno.h>
 
 #include <rtems/system.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/threadq.h>
 
diff --git a/cpukit/posix/src/pthreadkill.c b/cpukit/posix/src/pthreadkill.c
index b9f4922..02a9ee7 100644
--- a/cpukit/posix/src/pthreadkill.c
+++ b/cpukit/posix/src/pthreadkill.c
@@ -25,7 +25,7 @@
 #include <errno.h>
 
 #include <rtems/system.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 #include <rtems/posix/psignalimpl.h>
 #include <rtems/score/isr.h>
 #include <rtems/seterr.h>
diff --git a/cpukit/posix/src/pthreadsetschedparam.c b/cpukit/posix/src/pthreadsetschedparam.c
index e7a6161..393c41f 100644
--- a/cpukit/posix/src/pthreadsetschedparam.c
+++ b/cpukit/posix/src/pthreadsetschedparam.c
@@ -26,7 +26,7 @@
 #include <errno.h>
 
 #include <rtems/system.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 #include <rtems/posix/priorityimpl.h>
 #include <rtems/posix/time.h>
 
diff --git a/cpukit/posix/src/pthreadsigmask.c b/cpukit/posix/src/pthreadsigmask.c
index 5f30d8d..dc97b8d 100644
--- a/cpukit/posix/src/pthreadsigmask.c
+++ b/cpukit/posix/src/pthreadsigmask.c
@@ -27,7 +27,7 @@
 #include <errno.h>
 
 #include <rtems/system.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 #include <rtems/posix/psignalimpl.h>
 #include <rtems/seterr.h>
 
diff --git a/cpukit/posix/src/setcancelstate.c b/cpukit/posix/src/setcancelstate.c
index 4d0699c..0d85fe6 100644
--- a/cpukit/posix/src/setcancelstate.c
+++ b/cpukit/posix/src/setcancelstate.c
@@ -26,7 +26,7 @@
 #include <rtems/score/isr.h>
 #include <rtems/score/thread.h>
 #include <rtems/posix/cancel.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 #include <rtems/posix/threadsup.h>
 
 /*
diff --git a/cpukit/posix/src/setcanceltype.c b/cpukit/posix/src/setcanceltype.c
index 115eebf..f97affa 100644
--- a/cpukit/posix/src/setcanceltype.c
+++ b/cpukit/posix/src/setcanceltype.c
@@ -26,7 +26,7 @@
 #include <rtems/score/isr.h>
 #include <rtems/score/thread.h>
 #include <rtems/posix/cancel.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 #include <rtems/posix/threadsup.h>
 
 /*
diff --git a/cpukit/posix/src/sigaction.c b/cpukit/posix/src/sigaction.c
index cfcc65c..8dacc70 100644
--- a/cpukit/posix/src/sigaction.c
+++ b/cpukit/posix/src/sigaction.c
@@ -25,7 +25,7 @@
 #include <errno.h>
 
 #include <rtems/system.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 #include <rtems/posix/psignalimpl.h>
 #include <rtems/seterr.h>
 #include <rtems/score/isr.h>
diff --git a/cpukit/posix/src/sigpending.c b/cpukit/posix/src/sigpending.c
index 8e31d59..a0c1399 100644
--- a/cpukit/posix/src/sigpending.c
+++ b/cpukit/posix/src/sigpending.c
@@ -22,7 +22,7 @@
 #include <errno.h>
 
 #include <rtems/system.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 #include <rtems/posix/psignalimpl.h>
 #include <rtems/seterr.h>
 
diff --git a/cpukit/posix/src/sigqueue.c b/cpukit/posix/src/sigqueue.c
index 99c2147..73acc4e 100644
--- a/cpukit/posix/src/sigqueue.c
+++ b/cpukit/posix/src/sigqueue.c
@@ -22,7 +22,7 @@
 #include <errno.h>
 
 #include <rtems/system.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 #include <rtems/posix/psignalimpl.h>
 
 int sigqueue(
diff --git a/cpukit/posix/src/sigtimedwait.c b/cpukit/posix/src/sigtimedwait.c
index 5a3a5b0..c067c84 100644
--- a/cpukit/posix/src/sigtimedwait.c
+++ b/cpukit/posix/src/sigtimedwait.c
@@ -23,7 +23,7 @@
 #include <errno.h>
 
 #include <rtems/system.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 #include <rtems/posix/psignalimpl.h>
 #include <rtems/seterr.h>
 #include <rtems/posix/time.h>
diff --git a/cpukit/posix/src/testcancel.c b/cpukit/posix/src/testcancel.c
index e7e08d2..f999fe5 100644
--- a/cpukit/posix/src/testcancel.c
+++ b/cpukit/posix/src/testcancel.c
@@ -27,7 +27,7 @@
 #include <rtems/score/thread.h>
 #include <rtems/score/wkspace.h>
 #include <rtems/posix/cancel.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 #include <rtems/posix/threadsup.h>
 
 /*
diff --git a/cpukit/posix/src/ualarm.c b/cpukit/posix/src/ualarm.c
index e9a4bb8..01b8423 100644
--- a/cpukit/posix/src/ualarm.c
+++ b/cpukit/posix/src/ualarm.c
@@ -22,7 +22,7 @@
 /* #include <errno.h> */
 
 #include <rtems/system.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 #include <rtems/posix/psignalimpl.h>
 #include <rtems/posix/time.h>
 
diff --git a/cpukit/sapi/src/posixapi.c b/cpukit/sapi/src/posixapi.c
index a9d88f4..ba003b6 100644
--- a/cpukit/sapi/src/posixapi.c
+++ b/cpukit/sapi/src/posixapi.c
@@ -37,7 +37,7 @@
 #include <rtems/posix/posixapi.h>
 #include <rtems/posix/priorityimpl.h>
 #include <rtems/posix/psignalimpl.h>
-#include <rtems/posix/pthread.h>
+#include <rtems/posix/pthreadimpl.h>
 #include <rtems/posix/rwlock.h>
 #include <rtems/posix/timer.h>
 #include <rtems/posix/semaphoreimpl.h>
diff --git a/testsuites/psxtests/psxstack01/init.c b/testsuites/psxtests/psxstack01/init.c
index aadac4c..ce413e7 100644
--- a/testsuites/psxtests/psxstack01/init.c
+++ b/testsuites/psxtests/psxstack01/init.c
@@ -17,7 +17,7 @@
 #include <pthread.h>
 #include <sched.h>
 
-#include <rtems/posix/pthread.h> /* for PTHREAD_MINIMUM_STACK_SIZE */
+#include <rtems/posix/pthreadimpl.h> /* for PTHREAD_MINIMUM_STACK_SIZE */
 
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);
diff --git a/testsuites/psxtests/psxstack02/init.c b/testsuites/psxtests/psxstack02/init.c
index 603cf21..b58d257 100644
--- a/testsuites/psxtests/psxstack02/init.c
+++ b/testsuites/psxtests/psxstack02/init.c
@@ -19,7 +19,7 @@
 #include <pthread.h>
 #include <sched.h>
 
-#include <rtems/posix/pthread.h> /* for PTHREAD_MINIMUM_STACK_SIZE */
+#include <rtems/posix/pthreadimpl.h> /* for PTHREAD_MINIMUM_STACK_SIZE */
 
 /* forward declarations to avoid warnings */
 void *POSIX_Init(void *argument);




More information about the vc mailing list