* some hacks to make progress threads compile. Still don't work..

This commit was SVN r5243.

src/mca/ptl/sm/src/ptl_sm.c

@@ -201,7 +201,7 @@ int mca_ptl_sm_add_procs_same_base_addr(
                    mca_ptl_sm_component.num_smp_procs;
 
 #if OMPI_ENABLE_PROGRESS_THREADS == 1
-               sprintf(path, "%s/sm_fifo.%d", ompi_process_info.job_session_dir, 
+               sprintf(path, "%s/sm_fifo.%d", orte_process_info.job_session_dir, 
                    procs[proc]->proc_name.vpid);
                peer->fifo_fd = open(path, O_WRONLY);
                if(peer->fifo_fd < 0) {

src/mca/ptl/sm/src/ptl_sm_component.c

@@ -267,8 +267,8 @@ mca_ptl_base_module_t** mca_ptl_sm_component_init(
 #if OMPI_ENABLE_PROGRESS_THREADS == 1
     /* create a named pipe to receive events  */
     sprintf(mca_ptl_sm_component.sm_fifo_path, 
-        "%s/sm_fifo.%d", ompi_process_info.job_session_dir,
-         mca_oob_name_self.vpid);
+        "%s/sm_fifo.%d", orte_process_info.job_session_dir,
+         orte_process_info.my_name->vpid);
     if(mkfifo(mca_ptl_sm_component.sm_fifo_path, 0660) < 0) {
         ompi_output(0, "mca_ptl_sm_component_init: mkfifo failed with errno=%d\n",errno);
         return NULL;

src/mpi/runtime/ompi_mpi_init.c

@@ -375,9 +375,10 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided)
         goto error;
     }
 
-#if OMPI_ENABLE_PROGRESS_THREADS /* BWB - XXX - FIXME - is this actually correct? */
+#if OMPI_ENABLE_PROGRESS_THREADS && 0
+    /* BWB - XXX - FIXME - is this actually correct? */
     /* setup I/O forwarding */
-    if (ompi_process_info.seed == false) {
+    if (orte_process_info.seed == false) {
         if (OMPI_SUCCESS != (ret = ompi_mpi_init_io())) {
 	        error = "ompi_rte_init_io failed";
 	        goto error;