2009-09-26 Joel Sherrill <joel.sherrill@oarcorp.com>

	* libmisc/capture/capture.c, posix/src/pthread.c, rtems/src/tasks.c,
	score/include/rtems/score/userext.h: Eliminate use of deprecated
	rtems_extension. Re-add prototype for _User_extensions_Add_API_set.

5 files changed, 29 insertions, 13 deletions

diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 9bafd4f576..a7cd1a0510 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,5 +1,11 @@
 2009-09-26	Joel Sherrill <joel.sherrill@oarcorp.com>
 
+	* libmisc/capture/capture.c, posix/src/pthread.c, rtems/src/tasks.c,
+	score/include/rtems/score/userext.h: Eliminate use of deprecated
+	rtems_extension. Re-add prototype for _User_extensions_Add_API_set.
+
+2009-09-26	Joel Sherrill <joel.sherrill@oarcorp.com>
+
 	* libcsupport/include/rtems/libcsupport.h,
 	libcsupport/src/newlibc_reent.c: Eliminate use of deprecated
 	rtems_extension.
diff --git a/cpukit/libmisc/capture/capture.c b/cpukit/libmisc/capture/capture.c
index 288169d9df..1fb18d6f9d 100644
--- a/cpukit/libmisc/capture/capture.c
+++ b/cpukit/libmisc/capture/capture.c
@@ -7,7 +7,7 @@
   All rights reserved Objective Design Systems Pty Ltd, 2002
   Chris Johns (ccj@acm.org)
 
-  COPYRIGHT (c) 1989-2008.
+  COPYRIGHT (c) 1989-2009.
   On-Line Applications Research Corporation (OAR).
 
   The license and distribution terms for this file may be
@@ -687,7 +687,7 @@ rtems_capture_create_task (rtems_tcb* current_task,
  * This function is called when a task is started.
  *
  */
-static rtems_extension
+static void
 rtems_capture_start_task (rtems_tcb* current_task,
                           rtems_tcb* started_task)
 {
@@ -729,7 +729,7 @@ rtems_capture_start_task (rtems_tcb* current_task,
  * This function is called when a task is restarted.
  *
  */
-static rtems_extension
+static void
 rtems_capture_restart_task (rtems_tcb* current_task,
                             rtems_tcb* restarted_task)
 {
@@ -772,7 +772,7 @@ rtems_capture_restart_task (rtems_tcb* current_task,
  * This function is called when a task is deleted.
  *
  */
-static rtems_extension
+static void
 rtems_capture_delete_task (rtems_tcb* current_task,
                            rtems_tcb* deleted_task)
 {
@@ -822,7 +822,7 @@ rtems_capture_delete_task (rtems_tcb* current_task,
  * This function is called when a task is begun.
  *
  */
-static rtems_extension
+static void
 rtems_capture_begin_task (rtems_tcb* begin_task)
 {
   /*
@@ -854,7 +854,7 @@ rtems_capture_begin_task (rtems_tcb* begin_task)
  * returned rather than was deleted.
  *
  */
-static rtems_extension
+static void
 rtems_capture_exitted_task (rtems_tcb* exitted_task)
 {
   /*
@@ -887,7 +887,7 @@ rtems_capture_exitted_task (rtems_tcb* exitted_task)
  * This function is called when a context is switched.
  *
  */
-static rtems_extension
+static void
 rtems_capture_switch_task (rtems_tcb* current_task,
                            rtems_tcb* heir_task)
 {
diff --git a/cpukit/posix/src/pthread.c b/cpukit/posix/src/pthread.c
index 40bda0c856..1743a5de2b 100644
--- a/cpukit/posix/src/pthread.c
+++ b/cpukit/posix/src/pthread.c
@@ -228,7 +228,7 @@ bool _POSIX_Threads_Create_extension(
  *
  *  This method is invoked for each thread deleted.
  */
-User_extensions_routine _POSIX_Threads_Delete_extension(
+void _POSIX_Threads_Delete_extension(
   Thread_Control *executing __attribute__((unused)),
   Thread_Control *deleted
 )
@@ -270,7 +270,7 @@ User_extensions_routine _POSIX_Threads_Delete_extension(
  *
  *  This method is invoked each time a thread exits.
  */
-User_extensions_routine _POSIX_Threads_Exitted_extension(
+void _POSIX_Threads_Exitted_extension(
   Thread_Control *executing
 )
 {
diff --git a/cpukit/rtems/src/tasks.c b/cpukit/rtems/src/tasks.c
index 66c975cec8..e81bf72167 100644
--- a/cpukit/rtems/src/tasks.c
+++ b/cpukit/rtems/src/tasks.c
@@ -1,7 +1,7 @@
 /*
  *  RTEMS Task Manager -- Initialize Manager
  *
- *  COPYRIGHT (c) 1989-2008.
+ *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -88,7 +88,7 @@ bool _RTEMS_tasks_Create_extension(
  *  first time.
  */
 
-User_extensions_routine _RTEMS_tasks_Start_extension(
+void _RTEMS_tasks_Start_extension(
   Thread_Control *executing,
   Thread_Control *started
 )
@@ -107,7 +107,7 @@ User_extensions_routine _RTEMS_tasks_Start_extension(
  *  This extension routine is invoked when a task is deleted.
  */
 
-User_extensions_routine _RTEMS_tasks_Delete_extension(
+void _RTEMS_tasks_Delete_extension(
   Thread_Control *executing,
   Thread_Control *deleted
 )
diff --git a/cpukit/score/include/rtems/score/userext.h b/cpukit/score/include/rtems/score/userext.h
index 65fc1881c9..f8790799fd 100644
--- a/cpukit/score/include/rtems/score/userext.h
+++ b/cpukit/score/include/rtems/score/userext.h
@@ -7,7 +7,7 @@
  */
 
 /*
- *  COPYRIGHT (c) 1989-2008.
+ *  COPYRIGHT (c) 1989-2009.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -246,6 +246,16 @@ void _User_extensions_Add_set(
   User_extensions_Control *extension
 );
 
+/** @brief User extensions Add to API extension set
+ *
+ *  This routine is used to add an API extension set to the active list.
+ *
+ *  @param[in] the_extension is the extension set to add
+ */
+void _User_extensions_Add_API_set (
+  User_extensions_Control *the_extension
+);
+
 RTEMS_INLINE_ROUTINE void _User_extensions_Add_set_with_table(
   User_extensions_Control *extension,
   User_extensions_Table   *extension_table