Number of small fixes to get the trunk to build again on Catamount

This commit was SVN r20141.

orte/runtime/data_type_support/orte_dt_print_fns.c

@@ -158,11 +158,11 @@ int orte_dt_std_print(char **output, char *prefix, void *src, opal_data_type_t t
         case ORTE_GRPCOMM_MODE:
             orte_dt_quick_print(output, "ORTE_GRPCOMM_MODE", prefix, src, ORTE_GRPCOMM_MODE_T);
             break;
-#endif
             
         case ORTE_IOF_TAG:
             orte_dt_quick_print(output, "ORTE_IOF_TAG", prefix, src, ORTE_IOF_TAG_T);
             break;
+#endif
             
         default:
             ORTE_ERROR_LOG(ORTE_ERR_UNKNOWN_DATA_TYPE);

orte/runtime/data_type_support/orte_dt_size_fns.c

@@ -79,11 +79,11 @@ int orte_dt_std_size(size_t *size, void *src, opal_data_type_t type)
         case ORTE_GRPCOMM_MODE:
             *size = sizeof(orte_grpcomm_mode_t);
             break;
-#endif
             
         case ORTE_IOF_TAG:
             *size = sizeof(orte_iof_tag_t);
             break;
+#endif
             
         default:
             ORTE_ERROR_LOG(ORTE_ERR_UNKNOWN_DATA_TYPE);

orte/runtime/orte_globals.c

@@ -359,8 +359,6 @@ int orte_dt_init(void)
         return rc;
     }
 
-#endif /* !ORTE_DISABLE_FULL_SUPPORT */
-    
     tmp = ORTE_IOF_TAG;
     if (ORTE_SUCCESS != (rc = opal_dss.register_type(orte_dt_pack_iof_tag,
                                                      orte_dt_unpack_iof_tag,
@@ -374,6 +372,7 @@ int orte_dt_init(void)
         ORTE_ERROR_LOG(rc);
         return rc;
     }
+#endif /* !ORTE_DISABLE_FULL_SUPPORT */
     
     return ORTE_SUCCESS;    
 }