Fix invalid symbols left by the PMIx merge.

This commit was SVN r32597.

ompi/mca/mtl/portals4/mtl_portals4.c

@@ -85,7 +85,7 @@ ompi_mtl_portals4_add_procs(struct mca_mtl_base_module_t *mtl,
             return OMPI_ERR_NOT_SUPPORTED;
         }
 
-        OMPI_MODEX_RECV(ret, &mca_mtl_portals4_component.mtl_version,
+        OPAL_MODEX_RECV(ret, &mca_mtl_portals4_component.mtl_version,
                         &procs[i]->super, (char**)&modex_id, &size);
         if (OMPI_SUCCESS != ret) {
             opal_output_verbose(1, ompi_mtl_base_framework.framework_output,

ompi/mca/mtl/portals4/mtl_portals4_component.c

@@ -269,7 +269,7 @@ ompi_mtl_portals4_component_init(bool enable_progress_threads,
         goto error;
     }
 
-    OPAL_MODEX_SEND(ret, PMIX_SYNC_REQD, OPAL_PMIX_GLOBAL,
+    OPAL_MODEX_SEND(ret, PMIX_SYNC_REQD, PMIX_GLOBAL,
                     &mca_mtl_portals4_component.mtl_version,
                     &id, sizeof(id));
     if (OMPI_SUCCESS != ret) {