fcoll/two_phase: use PMPI_* insted of MPI_*

(cherry picked from commit open-mpi/ompi@002c7b8)

Author: ggouaillardet

ompi/mca/fcoll/two_phase/fcoll_two_phase_file_read_all.c

@@ -677,8 +677,8 @@ static int two_phase_read_and_exch(mca_io_ompio_file_t *fh,
 		    }
 		    if (req_off < real_off + real_size) {
 			count[i]++;
-			MPI_Address(read_buf+req_off-real_off,
-				    &(others_req[i].mem_ptrs[j]));
+			PMPI_Address(read_buf+req_off-real_off,
+				     &(others_req[i].mem_ptrs[j]));
 
 			send_size[i] += (int)(OMPIO_MIN(real_off + real_size - req_off,
 							(OMPI_MPI_OFFSET_TYPE)req_len));

ompi/mca/fcoll/two_phase/fcoll_two_phase_file_write_all.c

@@ -766,8 +766,8 @@ static int two_phase_exch_and_write(mca_io_ompio_file_t *fh,
 			       size,i,
 			       count[i]);
 #endif
-			MPI_Address(write_buf+req_off-off,
-				    &(others_req[i].mem_ptrs[j]));
+			PMPI_Address(write_buf+req_off-off,
+				     &(others_req[i].mem_ptrs[j]));
 #if DEBUG_ON
 			printf("%d : mem_ptrs : %ld\n", fh->f_rank,
 			       others_req[i].mem_ptrs[j]);

ompi/mca/fcoll/two_phase/fcoll_two_phase_support_fns.c

@@ -173,7 +173,7 @@ int mca_fcoll_two_phase_calc_aggregator(mca_io_ompio_file_t *fh,
        fprintf(stderr,
 	       "rank_index(%d) >= num_aggregators(%d)fd_size=%lld off=%lld\n",
 	       rank_index,num_aggregators,fd_size,off);
-       MPI_Abort(MPI_COMM_WORLD, 1);
+       PMPI_Abort(MPI_COMM_WORLD, 1);
     }