2007-11-28 Joel Sherrill <joel.sherrill@OARcorp.com>

	* sapi/src/exinit.c, score/include/rtems/score/object.h,
	score/include/rtems/score/thread.h, score/src/object.c,
	score/src/thread.c: Conditionally compile out more code that is
	specific to multiprocessor configurations.

4 files changed, 16 insertions, 6 deletions

diff --git a/cpukit/score/include/rtems/score/object.h b/cpukit/score/include/rtems/score/object.h
index 8058c47250..9b328a67a3 100644
--- a/cpukit/score/include/rtems/score/object.h
+++ b/cpukit/score/include/rtems/score/object.h
@@ -435,9 +435,11 @@ SCORE_EXTERN Objects_Information
  *             concurrently offered in the system.
  */
 void _Objects_Handler_initialization(
+#if defined(RTEMS_MULTIPROCESSING)
   uint32_t   node,
   uint32_t   maximum_nodes,
   uint32_t   maximum_global_objects
+#endif
 );
 
 /**
diff --git a/cpukit/score/include/rtems/score/thread.h b/cpukit/score/include/rtems/score/thread.h
index 87237e69be..5bfd4534e9 100644
--- a/cpukit/score/include/rtems/score/thread.h
+++ b/cpukit/score/include/rtems/score/thread.h
@@ -6,7 +6,7 @@
  */
 
 /*
- *  COPYRIGHT (c) 1989-2006.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -473,8 +473,11 @@ SCORE_EXTERN struct _reent **_Thread_libc_reent;
  */
 void _Thread_Handler_initialization (
   uint32_t     ticks_per_timeslice,
-  uint32_t     maximum_extensions,
+  uint32_t     maximum_extensions
+#if defined(RTEMS_MULTIPROCESSING)
+  ,
   uint32_t     maximum_proxies
+#endif
 );
 
 /**
diff --git a/cpukit/score/src/object.c b/cpukit/score/src/object.c
index ba486217a7..7168c6f2d4 100644
--- a/cpukit/score/src/object.c
+++ b/cpukit/score/src/object.c
@@ -2,7 +2,7 @@
  *  Object Handler
  *
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -43,11 +43,14 @@
  */
 
 void _Objects_Handler_initialization(
+#if defined(RTEMS_MULTIPROCESSING)
   uint32_t   node,
   uint32_t   maximum_nodes,
   uint32_t   maximum_global_objects
+#endif
 )
 {
+#if defined(RTEMS_MULTIPROCESSING)
   if ( node < 1 || node > maximum_nodes )
     _Internal_error_Occurred(
       INTERNAL_ERROR_CORE,
@@ -55,7 +58,6 @@ void _Objects_Handler_initialization(
       INTERNAL_ERROR_INVALID_NODE
     );
 
-#if defined(RTEMS_MULTIPROCESSING)
   _Objects_Local_node    = node;
   _Objects_Maximum_nodes = maximum_nodes;
 
diff --git a/cpukit/score/src/thread.c b/cpukit/score/src/thread.c
index 58b62b7116..8e924c65cf 100644
--- a/cpukit/score/src/thread.c
+++ b/cpukit/score/src/thread.c
@@ -2,7 +2,7 @@
  *  Thread Handler
  *
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -45,8 +45,11 @@
 
 void _Thread_Handler_initialization(
   uint32_t     ticks_per_timeslice,
-  uint32_t     maximum_extensions,
+  uint32_t     maximum_extensions
+#if defined(RTEMS_MULTIPROCESSING)
+  ,
   uint32_t     maximum_proxies
+#endif
 )
 {
   uint32_t        index;