fixes to get compiling on Red Storm again

This commit was SVN r20252.

contrib/platform/redstorm

@@ -6,7 +6,7 @@ enable_pretty_print_stacktrace=no
 enable_dlopen=no
 with_portals_config=redstorm
 with_memory_manager=none
-enable_mca_no_build=carto-file,maffinity,paffinity,btl-sm,btl-self,coll-hierarch,coll-sm,common-sm,mpool-sm,pml-dr,pml-v
+enable_mca_no_build=carto-file,maffinity,paffinity,pstat-linux,btl-sm,btl-self,coll-hierarch,coll-sm,common-sm,mpool-sm,pml-dr,pml-v
 enable_contrib_no_build=libnbc,vt
 with_rte_support=no
 enable_heterogeneous=no

orte/mca/odls/odls_types.h

@@ -97,6 +97,8 @@ typedef struct {
 } orte_odls_child_t;
 ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_odls_child_t);
 
+#if !ORTE_DISABLE_FULL_SUPPORT
+
 /*
  * List object to locally store job related info
  */
@@ -121,6 +123,8 @@ typedef struct orte_odls_job_t {
 } orte_odls_job_t;
 ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_odls_job_t);
 
+#endif
+
 END_C_DECLS
 
 #endif

orte/runtime/orte_mca_params.c

@@ -39,12 +39,6 @@ int orte_register_params(void)
 {
     int value;
     
-    mca_base_param_reg_int_name("orte", "send_profile",
-                                "Send profile info in launch message",
-                                false, false,
-                                (int) false, &value);
-    orte_send_profile = OPAL_INT_TO_BOOL(value);
-    
     mca_base_param_reg_int_name("orte", "base_help_aggregate",
                                 "If orte_base_help_aggregate is true, duplicate help messages will be aggregated rather than displayed individually.  This can be helpful for parallel jobs that experience multiple identical failures; rather than print out the same help/failure message N times, display it once with a count of how many processes sent the same message.",
                                 false, false,
@@ -60,6 +54,13 @@ int orte_register_params(void)
                                    false, false, NULL,  &orte_prohibited_session_dirs);
 
 #if !ORTE_DISABLE_FULL_SUPPORT
+    
+    mca_base_param_reg_int_name("orte", "send_profile",
+                                "Send profile info in launch message",
+                                false, false,
+                                (int) false, &value);
+    orte_send_profile = OPAL_INT_TO_BOOL(value);
+
     mca_base_param_reg_int_name("orte", "debug",
                                 "Top-level ORTE debug switch (default verbosity: 1)",
                                 false, false, (int)false, &value);