Remove redundant declaration of orte_soh and move it into

src/mca/soh/base/base.h (similar to most other frameworks).

This commit was SVN r5073.

src/mca/oob/base/oob_base_xcast.c

@@ -24,7 +24,7 @@
 #include "mca/ns/ns.h"
 #include "mca/gpr/gpr.h"
 #include "mca/errmgr/errmgr.h"
-#include "mca/soh/soh.h"
+#include "mca/soh/base/base.h"
 #include "runtime/runtime.h"
 
 

src/mca/pls/fork/pls_fork_module.c

@@ -45,6 +45,7 @@
 #include "mca/rmaps/base/base.h"
 #include "mca/rmaps/base/rmaps_base_map.h"
 #include "mca/soh/soh.h"
+#include "mca/soh/base/base.h"
 #include "pls_fork.h"
 
 

src/mca/pls/rsh/pls_rsh_module.c

@@ -41,6 +41,7 @@
 #include "mca/ras/base/ras_base_node.h"
 #include "mca/rmaps/base/rmaps_base_map.h"
 #include "mca/soh/soh.h"
+#include "mca/soh/base/base.h"
 #include "pls_rsh.h"
 
 #define NUM_CONCURRENT 128

src/mca/soh/soh.h

@@ -137,12 +137,4 @@ typedef orte_soh_base_component_1_0_0_t orte_soh_base_component_t;
   /* soh v1.0 */ \
   "soh", 1, 0, 0
 
-/**
-  * Global structure for accessing SOH functions
-  */
-
-OMPI_DECLSPEC extern orte_soh_base_module_t orte_soh;  /* holds selected module's function pointers */
-
-
-
 #endif /* ORTE_SOH_H */

src/mpi/runtime/ompi_mpi_finalize.c

@@ -53,11 +53,11 @@
 #include "mca/gpr/gpr.h"
 #include "mca/rml/rml.h"
 #include "mca/soh/soh.h"
+#include "mca/soh/base/base.h"
 #include "mca/errmgr/errmgr.h"
 #include "mca/mpool/base/base.h"
 
 
-
 int ompi_mpi_finalize(void)
 {
     int ret;

src/mpi/runtime/ompi_mpi_init.c

@@ -57,6 +57,7 @@
 #include "mca/gpr/gpr.h"
 #include "mca/rml/rml.h"
 #include "mca/soh/soh.h"
+#include "mca/soh/base/base.h"
 #include "mca/errmgr/errmgr.h"
 
 #include "runtime/runtime.h"

src/tools/orted/orted.c

@@ -55,6 +55,7 @@
 #include "mca/gpr/gpr.h"
 #include "mca/rml/rml.h"
 #include "mca/soh/soh.h"
+#include "mca/soh/base/base.h"
 
 #include "runtime/runtime.h"