* bunch of fixes for Red Storm - missing header files and the like

This commit was SVN r7325.

contrib/platform/redstorm

@@ -7,3 +7,5 @@ enable_pretty_print_stacktrace=no
 enable_dlopen=no
 with_portals_config=redstorm
 enable_mca_no_build=gpr-proxy,gpr-replica,pml-teg,pml-uniq,rml-oob,btl-sm,mpool-sm,btl-self,ptl-sm,ptl-self,ns-proxy,rds-resfile,sds-env,sds-seed,sds-singleton
+with_memory_manager=no
+enable_heterogeneous=no

ompi/mca/btl/portals/btl_portals_component.c

@@ -23,6 +23,7 @@
 
 #include "opal/util/output.h"
 #include "opal/threads/threads.h"
+#include "opal/mca/base/mca_base_param.h"
 
 #include "btl_portals.h"
 #include "btl_portals_compat.h"

ompi/mca/btl/portals/btl_portals_rdma.c

@@ -18,6 +18,7 @@
 #include "ompi_config.h"
 
 #include "ompi/include/constants.h"
+#include "opal/util/output.h"
 
 #include "btl_portals.h"
 #include "btl_portals_frag.h"

ompi/mca/btl/portals/btl_portals_recv.c

@@ -18,6 +18,7 @@
 #include "ompi_config.h"
 
 #include "ompi/include/constants.h"
+#include "opal/util/output.h"
 
 #include "btl_portals.h"
 #include "btl_portals_recv.h"

ompi/mca/btl/portals/btl_portals_send.c

@@ -20,6 +20,7 @@
 #include <assert.h>
 
 #include "ompi/include/constants.h"
+#include "opal/util/output.h"
 
 #include "btl_portals.h"
 #include "btl_portals_send.h"

orte/mca/sds/cnos/sds_cnos_module.c

@@ -57,7 +57,7 @@ orte_sds_cnos_contact_universe(void)
 	orte_process_info.gpr_replica = NULL;
     }
 
-    return OMPI_SUCCESS;
+    return ORTE_SUCCESS;
 }
 
 int

orte/runtime/orte_wait.c

@@ -616,49 +616,49 @@ internal_waitpid_callback(int fd, short event, void *arg)
 
 int
 orte_wait_init(void) {
-    return OMPI_SUCCESS;
+    return ORTE_SUCCESS;
 }
 
 int
 orte_wait_finalize(void)
 {
-    return OMPI_SUCCESS;
+    return ORTE_SUCCESS;
 }
 
 pid_t
 orte_waitpid(pid_t wpid, int *status, int options)
 {
-    return OMPI_ERR_NOT_SUPPORTED;
+    return ORTE_ERR_NOT_SUPPORTED;
 }
 
 int
 orte_wait_cb(pid_t wpid, orte_wait_fn_t callback, void *data)
 {
-    return OMPI_ERR_NOT_SUPPORTED;
+    return ORTE_ERR_NOT_SUPPORTED;
 }
 
 int
 orte_wait_cb_cancel(pid_t wpid)
 {
-    return OMPI_ERR_NOT_SUPPORTED;
+    return ORTE_ERR_NOT_SUPPORTED;
 }
 
 int
 orte_wait_cb_disable(void)
 {
-    return OMPI_ERR_NOT_SUPPORTED;
+    return ORTE_ERR_NOT_SUPPORTED;
 }
 
 int
 orte_wait_cb_enable(void)
 {
-    return OMPI_ERR_NOT_SUPPORTED;
+    return ORTE_ERR_NOT_SUPPORTED;
 }
 
 int
 orte_wait_kill(int sig)
 {
-    return OMPI_ERR_NOT_SUPPORTED;
+    return ORTE_ERR_NOT_SUPPORTED;
 }
 
 #endif