Merge pull request #8537 from jsquyres/pr/fix-compile-errors

Fix compile errors

Author: jsquyres

ompi/mca/pml/ob1/pml_ob1_recvreq.c

@@ -1308,7 +1308,7 @@ void mca_pml_ob1_recv_req_start(mca_pml_ob1_recv_request_t *req)
                 req->req_recv.req_base.req_peer, req->req_recv.req_base.req_tag, comm_ptr->c_contextid));
             req->req_recv.req_base.req_ompi.req_status.MPI_ERROR = ompi_comm_is_revoked(comm_ptr)? MPI_ERR_REVOKED: MPI_ERR_PROC_FAILED;
             recv_request_pml_complete( req );
-            PERUSE_TRACE_COMM_EVENT(PERSUSE_COMM_SEARCH_UNEX_Q_END,
+            PERUSE_TRACE_COMM_EVENT(PERUSE_COMM_SEARCH_UNEX_Q_END,
                                     &(req->req_recv.req_base), PERUSE_RECV);
             OB1_MATCHING_UNLOCK(&ob1_comm->matching_lock);
             return;

ompi/proc/proc.c

@@ -154,7 +154,7 @@ int ompi_proc_complete_init_single (ompi_proc_t *proc)
         } else {
             ui32ptr = &(proc->super.proc_arch);
             OPAL_MODEX_RECV_VALUE_OPTIONAL(ret, "OMPI_ARCH", &proc->super.proc_name,
-                                           (void**)&ui32ptr, OPAL_UINT32);
+                                           (void**)&ui32ptr, PMIX_UINT32);
             if (OPAL_SUCCESS == ret) {
                 /* if arch is different than mine, create a new convertor for this proc */
                 if (proc->super.proc_arch != opal_local_arch) {
@@ -267,7 +267,7 @@ int ompi_proc_init(void)
 #if OPAL_ENABLE_HETEROGENEOUS_SUPPORT
     /* add our arch to the modex */
     OPAL_MODEX_SEND_VALUE(ret, PMIX_GLOBAL,
-                          "OMPI_ARCH", &opal_local_arch, OPAL_UINT32);
+                          "OMPI_ARCH", &opal_local_arch, PMIX_UINT32);
     if (OPAL_SUCCESS != ret) {
         return ret;
     }