split the inclusion of "EXTERN" data based on whether it was sapi,

score, rtems api, or posix api related.

10 files changed, 13 insertions, 12 deletions

diff --git a/cpukit/rtems/include/rtems/rtems/dpmem.h b/cpukit/rtems/include/rtems/rtems/dpmem.h
index fc580c1a8a..6f8893dd4b 100644
--- a/cpukit/rtems/include/rtems/rtems/dpmem.h
+++ b/cpukit/rtems/include/rtems/rtems/dpmem.h
@@ -51,7 +51,7 @@ typedef struct {
  *  The following define the internal Dual Ported Memory information.
  */
 
-EXTERN Objects_Information  _Dual_ported_memory_Information;
+RTEMS_EXTERN Objects_Information  _Dual_ported_memory_Information;
 
 /*
  *  _Dual_ported_memory_Manager_initialization
diff --git a/cpukit/rtems/include/rtems/rtems/event.h b/cpukit/rtems/include/rtems/rtems/event.h
index 4cd3b1cbea..6cb9882da5 100644
--- a/cpukit/rtems/include/rtems/rtems/event.h
+++ b/cpukit/rtems/include/rtems/rtems/event.h
@@ -159,7 +159,7 @@ void _Event_Timeout (
  *  executing thread are received properly.
  */
 
-EXTERN volatile Event_Sync_states _Event_Sync_state;
+RTEMS_EXTERN volatile Event_Sync_states _Event_Sync_state;
 
 #include <rtems/rtems/eventmp.h>
 #ifndef __RTEMS_APPLICATION__
diff --git a/cpukit/rtems/include/rtems/rtems/message.h b/cpukit/rtems/include/rtems/rtems/message.h
index 0469f8ddbf..0f8fe9f1b1 100644
--- a/cpukit/rtems/include/rtems/rtems/message.h
+++ b/cpukit/rtems/include/rtems/rtems/message.h
@@ -68,7 +68,7 @@ typedef struct {
  *  manage this class of objects.
  */
 
-EXTERN Objects_Information  _Message_queue_Information;
+RTEMS_EXTERN Objects_Information  _Message_queue_Information;
 
 /*
  *  _Message_queue_Manager_initialization
diff --git a/cpukit/rtems/include/rtems/rtems/part.h b/cpukit/rtems/include/rtems/rtems/part.h
index e06a2e4b86..c3410da9b3 100644
--- a/cpukit/rtems/include/rtems/rtems/part.h
+++ b/cpukit/rtems/include/rtems/rtems/part.h
@@ -55,7 +55,7 @@ typedef struct {
  *  manage this class of objects.
  */
 
-EXTERN Objects_Information _Partition_Information;
+RTEMS_EXTERN Objects_Information _Partition_Information;
 
 /*
  *  _Partition_Manager_initialization
diff --git a/cpukit/rtems/include/rtems/rtems/ratemon.h b/cpukit/rtems/include/rtems/rtems/ratemon.h
index a85bbcdc09..85c17cf3eb 100644
--- a/cpukit/rtems/include/rtems/rtems/ratemon.h
+++ b/cpukit/rtems/include/rtems/rtems/ratemon.h
@@ -67,7 +67,7 @@ typedef struct {
   Thread_Control               *owner;
 }   Rate_monotonic_Control;
 
-EXTERN Objects_Information _Rate_monotonic_Information;
+RTEMS_EXTERN Objects_Information _Rate_monotonic_Information;
 
 /*
  *  _Rate_monotonic_Manager_initialization
diff --git a/cpukit/rtems/include/rtems/rtems/region.h b/cpukit/rtems/include/rtems/rtems/region.h
index 7ee2658cd2..1683613087 100644
--- a/cpukit/rtems/include/rtems/rtems/region.h
+++ b/cpukit/rtems/include/rtems/rtems/region.h
@@ -59,7 +59,7 @@ typedef struct {
  *  manage this class of objects.
  */
 
-EXTERN Objects_Information _Region_Information;
+RTEMS_EXTERN Objects_Information _Region_Information;
 
 /*
  *  _Region_Manager_initialization
diff --git a/cpukit/rtems/include/rtems/rtems/sem.h b/cpukit/rtems/include/rtems/rtems/sem.h
index c4f8574b17..cb47ee3548 100644
--- a/cpukit/rtems/include/rtems/rtems/sem.h
+++ b/cpukit/rtems/include/rtems/rtems/sem.h
@@ -58,7 +58,7 @@ typedef struct {
  *  this class of objects.
  */
 
-EXTERN Objects_Information  _Semaphore_Information;
+RTEMS_EXTERN Objects_Information  _Semaphore_Information;
 
 /*
  *  _Semaphore_Manager_initialization
diff --git a/cpukit/rtems/include/rtems/rtems/status.h b/cpukit/rtems/include/rtems/rtems/status.h
index 23c1c830c6..ac9b9d1046 100644
--- a/cpukit/rtems/include/rtems/rtems/status.h
+++ b/cpukit/rtems/include/rtems/rtems/status.h
@@ -60,7 +60,7 @@ typedef enum {
 
 extern rtems_status_code _Status_Object_name_errors_to_status[];
 
-#ifdef INIT
+#ifdef RTEMS_API_INIT
 rtems_status_code _Status_Object_name_errors_to_status[] = {
   RTEMS_SUCCESSFUL,      /* OBJECTS_SUCCESSFUL */
   RTEMS_INVALID_NAME,    /* OBJECTS_INVALID_NAME */
diff --git a/cpukit/rtems/include/rtems/rtems/tasks.h b/cpukit/rtems/include/rtems/rtems/tasks.h
index 43f65dd5f3..dc30264635 100644
--- a/cpukit/rtems/include/rtems/rtems/tasks.h
+++ b/cpukit/rtems/include/rtems/rtems/tasks.h
@@ -164,14 +164,15 @@ typedef struct {
  *  manage this class of objects.
  */
 
-EXTERN Objects_Information _RTEMS_tasks_Information;
+RTEMS_EXTERN Objects_Information _RTEMS_tasks_Information;
 
 /*
  *  These are used to manage the user initialization tasks.
  */
 
-EXTERN rtems_initialization_tasks_table *_RTEMS_tasks_User_initialization_tasks;
-EXTERN unsigned32   _RTEMS_tasks_Number_of_initialization_tasks;
+RTEMS_EXTERN rtems_initialization_tasks_table 
+               *_RTEMS_tasks_User_initialization_tasks;
+RTEMS_EXTERN unsigned32   _RTEMS_tasks_Number_of_initialization_tasks;
 
 /*
  *  _RTEMS_tasks_Manager_initialization
diff --git a/cpukit/rtems/include/rtems/rtems/timer.h b/cpukit/rtems/include/rtems/rtems/timer.h
index d09b80d5ff..197719c17b 100644
--- a/cpukit/rtems/include/rtems/rtems/timer.h
+++ b/cpukit/rtems/include/rtems/rtems/timer.h
@@ -64,7 +64,7 @@ typedef rtems_timer_service_routine ( *rtems_timer_service_routine_entry )(
  *  this class of objects.
  */
 
-EXTERN Objects_Information  _Timer_Information;
+RTEMS_EXTERN Objects_Information  _Timer_Information;
 
 /*
  *  The following records define the control block used to manage