1212 *                         All rights reserved. 
1313 * Copyright (c) 2012      Los Alamos National Security, LLC.  All rights 
1414 *                         reserved. 
15-  * Copyright (c) 2013-2014  Intel, Inc. All rights reserved 
16-  * Copyright (c) 2015 Cisco Systems, Inc.  All rights reserved. 
15+  * Copyright (c) 2013-2020  Intel, Inc.   All rights reserved.  
16+  * Copyright (c) 2015-2020  Cisco Systems, Inc.  All rights reserved. 
1717 * Copyright (c) 2020      Amazon.com, Inc. or its affiliates.  All Rights 
1818 *                         reserved. 
19+  * Copyright (c) 2021      Nanook Consulting.  All rights reserved. 
1920 * $COPYRIGHT$ 
2021 * 
2122 * Additional copyrights may follow 
@@ -343,7 +344,7 @@ mca_pml_base_pml_check_selected_impl(const char *my_pml,
343344    OPAL_MODEX_RECV_STRING (ret ,
344345                           mca_base_component_to_string (& pml_base_component ),
345346                           & proc_name , (void * * ) & remote_pml , & size );
346-     if  (PMIX_ERR_NOT_FOUND  ==  ret ) {
347+     if  (OPAL_ERR_NOT_FOUND  ==  ret ) {
347348        opal_output_verbose ( 10 , ompi_pml_base_framework .framework_output ,
348349                            "check:select: PML modex for process %s not found" ,
349350                            OMPI_NAME_PRINT (& proc_name ));
@@ -370,8 +371,8 @@ mca_pml_base_pml_check_selected_impl(const char *my_pml,
370371    if  ((size  !=  strlen (my_pml ) +  1 ) || 
371372        (0  !=  strcmp (my_pml , remote_pml ))) {
372373        char  * errhost  =  NULL ;
373-         OPAL_MODEX_RECV_VALUE_OPTIONAL (ret , PMIX_HOSTNAME , & proc_name ,
374-                                        & (errhost ), PMIX_STRING );
374+         OPAL_MODEX_RECV_VALUE_OPTIONAL (ret , OPAL_PMIX_HOSTNAME , & proc_name ,
375+                                        & (errhost ), OPAL_STRING );
375376        opal_output (0 , "%s selected pml %s, but peer %s on %s selected pml %s" ,
376377                    OMPI_NAME_PRINT (& ompi_proc_local ()-> super .proc_name ),
377378                    my_pml , OMPI_NAME_PRINT (& proc_name ),
0 commit comments