diff --git a/ompi/mca/pml/cm/pml_cm.h b/ompi/mca/pml/cm/pml_cm.h index 13be9e7478..c3a19e570d 100644 --- a/ompi/mca/pml/cm/pml_cm.h +++ b/ompi/mca/pml/cm/pml_cm.h @@ -45,83 +45,83 @@ typedef struct ompi_pml_cm_t ompi_pml_cm_t; extern ompi_pml_cm_t ompi_pml_cm; /* PML interface functions */ -OPAL_MODULE_DECLSPEC extern int mca_pml_cm_add_procs(struct ompi_proc_t **procs, size_t nprocs); -OPAL_MODULE_DECLSPEC extern int mca_pml_cm_del_procs(struct ompi_proc_t **procs, size_t nprocs); +OMPI_DECLSPEC extern int mca_pml_cm_add_procs(struct ompi_proc_t **procs, size_t nprocs); +OMPI_DECLSPEC extern int mca_pml_cm_del_procs(struct ompi_proc_t **procs, size_t nprocs); -OPAL_MODULE_DECLSPEC extern int mca_pml_cm_enable(bool enable); -OPAL_MODULE_DECLSPEC extern int mca_pml_cm_progress(void); +OMPI_DECLSPEC extern int mca_pml_cm_enable(bool enable); +OMPI_DECLSPEC extern int mca_pml_cm_progress(void); -OPAL_MODULE_DECLSPEC extern int mca_pml_cm_add_comm(struct ompi_communicator_t* comm); -OPAL_MODULE_DECLSPEC extern int mca_pml_cm_del_comm(struct ompi_communicator_t* comm); +OMPI_DECLSPEC extern int mca_pml_cm_add_comm(struct ompi_communicator_t* comm); +OMPI_DECLSPEC extern int mca_pml_cm_del_comm(struct ompi_communicator_t* comm); -OPAL_MODULE_DECLSPEC extern int mca_pml_cm_irecv_init(void *buf, - size_t count, - ompi_datatype_t *datatype, - int src, - int tag, - struct ompi_communicator_t* comm, - struct ompi_request_t **request); +OMPI_DECLSPEC extern int mca_pml_cm_irecv_init(void *buf, + size_t count, + ompi_datatype_t *datatype, + int src, + int tag, + struct ompi_communicator_t* comm, + struct ompi_request_t **request); -OPAL_MODULE_DECLSPEC extern int mca_pml_cm_irecv(void *buf, - size_t count, - ompi_datatype_t *datatype, - int src, - int tag, - struct ompi_communicator_t* comm, - struct ompi_request_t **request); +OMPI_DECLSPEC extern int mca_pml_cm_irecv(void *buf, + size_t count, + ompi_datatype_t *datatype, + int src, + int tag, + struct ompi_communicator_t* comm, + struct ompi_request_t **request); -OPAL_MODULE_DECLSPEC extern int mca_pml_cm_recv(void *buf, - size_t count, - ompi_datatype_t *datatype, - int src, - int tag, - struct ompi_communicator_t* comm, - ompi_status_public_t* status ); +OMPI_DECLSPEC extern int mca_pml_cm_recv(void *buf, + size_t count, + ompi_datatype_t *datatype, + int src, + int tag, + struct ompi_communicator_t* comm, + ompi_status_public_t* status ); -OPAL_MODULE_DECLSPEC extern int mca_pml_cm_isend_init(void *buf, - size_t count, - ompi_datatype_t *datatype, - int dst, - int tag, - mca_pml_base_send_mode_t mode, - struct ompi_communicator_t* comm, - struct ompi_request_t **request); +OMPI_DECLSPEC extern int mca_pml_cm_isend_init(void *buf, + size_t count, + ompi_datatype_t *datatype, + int dst, + int tag, + mca_pml_base_send_mode_t mode, + struct ompi_communicator_t* comm, + struct ompi_request_t **request); -OPAL_MODULE_DECLSPEC extern int mca_pml_cm_isend(void *buf, - size_t count, - ompi_datatype_t *datatype, - int dst, - int tag, - mca_pml_base_send_mode_t mode, - struct ompi_communicator_t* comm, - struct ompi_request_t **request); +OMPI_DECLSPEC extern int mca_pml_cm_isend(void *buf, + size_t count, + ompi_datatype_t *datatype, + int dst, + int tag, + mca_pml_base_send_mode_t mode, + struct ompi_communicator_t* comm, + struct ompi_request_t **request); -OPAL_MODULE_DECLSPEC extern int mca_pml_cm_send(void *buf, - size_t count, - ompi_datatype_t *datatype, - int dst, - int tag, - mca_pml_base_send_mode_t mode, - struct ompi_communicator_t* comm); +OMPI_DECLSPEC extern int mca_pml_cm_send(void *buf, + size_t count, + ompi_datatype_t *datatype, + int dst, + int tag, + mca_pml_base_send_mode_t mode, + struct ompi_communicator_t* comm); -OPAL_MODULE_DECLSPEC extern int mca_pml_cm_iprobe(int dst, - int tag, - struct ompi_communicator_t* comm, - int *matched, - ompi_status_public_t* status); +OMPI_DECLSPEC extern int mca_pml_cm_iprobe(int dst, + int tag, + struct ompi_communicator_t* comm, + int *matched, + ompi_status_public_t* status); -OPAL_MODULE_DECLSPEC extern int mca_pml_cm_probe(int dst, - int tag, - struct ompi_communicator_t* comm, - ompi_status_public_t* status); +OMPI_DECLSPEC extern int mca_pml_cm_probe(int dst, + int tag, + struct ompi_communicator_t* comm, + ompi_status_public_t* status); -OPAL_MODULE_DECLSPEC extern int mca_pml_cm_start(size_t count, ompi_request_t** requests); +OMPI_DECLSPEC extern int mca_pml_cm_start(size_t count, ompi_request_t** requests); -OPAL_MODULE_DECLSPEC extern int mca_pml_cm_dump(struct ompi_communicator_t* comm, - int verbose); +OMPI_DECLSPEC extern int mca_pml_cm_dump(struct ompi_communicator_t* comm, + int verbose); -OPAL_MODULE_DECLSPEC extern int mca_pml_cm_cancel(struct ompi_request_t *request, int flag); +OMPI_DECLSPEC extern int mca_pml_cm_cancel(struct ompi_request_t *request, int flag); END_C_DECLS diff --git a/orte/mca/errmgr/hnp/errmgr_hnp.h b/orte/mca/errmgr/hnp/errmgr_hnp.h index af538e2fc4..6ae6639289 100644 --- a/orte/mca/errmgr/hnp/errmgr_hnp.h +++ b/orte/mca/errmgr/hnp/errmgr_hnp.h @@ -51,7 +51,7 @@ struct orte_errmgr_hnp_component_t { #endif }; typedef struct orte_errmgr_hnp_component_t orte_errmgr_hnp_component_t; -OPAL_MODULE_DECLSPEC extern orte_errmgr_hnp_component_t mca_errmgr_hnp_component; +ORTE_MODULE_DECLSPEC extern orte_errmgr_hnp_component_t mca_errmgr_hnp_component; int orte_errmgr_hnp_component_query(mca_base_module_t **module, int *priority); diff --git a/orte/runtime/orte_cr.h b/orte/runtime/orte_cr.h index 2d1b6760f4..7969905c88 100644 --- a/orte/runtime/orte_cr.h +++ b/orte/runtime/orte_cr.h @@ -54,8 +54,8 @@ BEGIN_C_DECLS * If one of the BTLs that shutdown require a full, clean rebuild of the * point-to-point stack on 'continue' as well as 'restart'. */ - OPAL_DECLSPEC extern bool orte_cr_continue_like_restart; - OPAL_DECLSPEC extern bool orte_cr_flush_restart_files; + ORTE_DECLSPEC extern bool orte_cr_continue_like_restart; + ORTE_DECLSPEC extern bool orte_cr_flush_restart_files; END_C_DECLS