From eea712f9abffeeddbfb06533cc42027651d9b2ff Mon Sep 17 00:00:00 2001 From: Shiqing Fan Date: Wed, 8 Aug 2007 16:20:17 +0000 Subject: [PATCH] - Export those components in correct way. This commit was SVN r15804. --- orte/mca/errmgr/hnp/errmgr_hnp.h | 2 ++ orte/mca/errmgr/hnp/errmgr_hnp_component.c | 2 +- orte/mca/errmgr/orted/errmgr_orted.h | 2 ++ orte/mca/errmgr/orted/errmgr_orted_component.c | 2 +- orte/mca/errmgr/proxy/errmgr_proxy.h | 2 ++ orte/mca/errmgr/proxy/errmgr_proxy_component.c | 2 +- orte/mca/pls/proxy/pls_proxy.h | 1 + orte/mca/pls/proxy/pls_proxy_component.c | 2 +- orte/mca/pls/slurm/pls_slurm.h | 2 +- orte/mca/pls/slurm/pls_slurm_component.c | 2 +- orte/mca/rds/proxy/rds_proxy.h | 2 +- orte/mca/rds/proxy/rds_proxy_component.c | 2 +- 12 files changed, 15 insertions(+), 8 deletions(-) diff --git a/orte/mca/errmgr/hnp/errmgr_hnp.h b/orte/mca/errmgr/hnp/errmgr_hnp.h index 42012dcca6..8dc79d13e4 100644 --- a/orte/mca/errmgr/hnp/errmgr_hnp.h +++ b/orte/mca/errmgr/hnp/errmgr_hnp.h @@ -72,6 +72,8 @@ int orte_errmgr_hnp_register_job(orte_jobid_t job); int orte_errmgr_hnp_abort_procs_request(orte_process_name_t *procs, orte_std_cntr_t nprocs); +ORTE_MODULE_DECLSPEC extern mca_errmgr_base_component_t mca_errmgr_hnp_component; + #if defined(c_plusplus) || defined(__cplusplus) } #endif diff --git a/orte/mca/errmgr/hnp/errmgr_hnp_component.c b/orte/mca/errmgr/hnp/errmgr_hnp_component.c index fdfcfa4ab5..19772a995d 100644 --- a/orte/mca/errmgr/hnp/errmgr_hnp_component.c +++ b/orte/mca/errmgr/hnp/errmgr_hnp_component.c @@ -47,7 +47,7 @@ /* * Struct of function pointers that need to be initialized */ -ORTE_MODULE_DECLSPEC mca_errmgr_base_component_t mca_errmgr_hnp_component = { +mca_errmgr_base_component_t mca_errmgr_hnp_component = { { ORTE_ERRMGR_BASE_VERSION_1_3_0, diff --git a/orte/mca/errmgr/orted/errmgr_orted.h b/orte/mca/errmgr/orted/errmgr_orted.h index de44dc3eed..a8612c6035 100644 --- a/orte/mca/errmgr/orted/errmgr_orted.h +++ b/orte/mca/errmgr/orted/errmgr_orted.h @@ -74,6 +74,8 @@ int orte_errmgr_orted_register_job(orte_jobid_t job); int orte_errmgr_orted_abort_procs_request(orte_process_name_t *procs, orte_std_cntr_t nprocs); +ORTE_MODULE_DECLSPEC extern mca_errmgr_base_component_t mca_errmgr_orted_component; + #if defined(c_plusplus) || defined(__cplusplus) } #endif diff --git a/orte/mca/errmgr/orted/errmgr_orted_component.c b/orte/mca/errmgr/orted/errmgr_orted_component.c index 689fe913e2..f240ea2740 100644 --- a/orte/mca/errmgr/orted/errmgr_orted_component.c +++ b/orte/mca/errmgr/orted/errmgr_orted_component.c @@ -47,7 +47,7 @@ /* * Struct of function pointers that need to be initialized */ -ORTE_MODULE_DECLSPEC mca_errmgr_base_component_t mca_errmgr_orted_component = { +mca_errmgr_base_component_t mca_errmgr_orted_component = { { ORTE_ERRMGR_BASE_VERSION_1_3_0, diff --git a/orte/mca/errmgr/proxy/errmgr_proxy.h b/orte/mca/errmgr/proxy/errmgr_proxy.h index f44d1e9f35..7d5ed8e4fe 100644 --- a/orte/mca/errmgr/proxy/errmgr_proxy.h +++ b/orte/mca/errmgr/proxy/errmgr_proxy.h @@ -74,6 +74,8 @@ int orte_errmgr_proxy_register_job(orte_jobid_t job); int orte_errmgr_proxy_abort_procs_request(orte_process_name_t *procs, orte_std_cntr_t nprocs); +ORTE_MODULE_DECLSPEC extern mca_errmgr_base_component_t mca_errmgr_proxy_component; + #if defined(c_plusplus) || defined(__cplusplus) } #endif diff --git a/orte/mca/errmgr/proxy/errmgr_proxy_component.c b/orte/mca/errmgr/proxy/errmgr_proxy_component.c index efb193433d..11953f9dd4 100644 --- a/orte/mca/errmgr/proxy/errmgr_proxy_component.c +++ b/orte/mca/errmgr/proxy/errmgr_proxy_component.c @@ -47,7 +47,7 @@ /* * Struct of function pointers that need to be initialized */ -ORTE_MODULE_DECLSPEC mca_errmgr_base_component_t mca_errmgr_proxy_component = { +mca_errmgr_base_component_t mca_errmgr_proxy_component = { { ORTE_ERRMGR_BASE_VERSION_1_3_0, diff --git a/orte/mca/pls/proxy/pls_proxy.h b/orte/mca/pls/proxy/pls_proxy.h index addd8d0c23..3a686b15d9 100644 --- a/orte/mca/pls/proxy/pls_proxy.h +++ b/orte/mca/pls/proxy/pls_proxy.h @@ -58,6 +58,7 @@ int orte_pls_proxy_terminate_proc(const orte_process_name_t* name); int orte_pls_proxy_signal_job(orte_jobid_t job, int32_t signal, opal_list_t *attrs); int orte_pls_proxy_signal_proc(const orte_process_name_t* name, int32_t signal); +ORTE_MODULE_DECLSPEC extern orte_pls_base_component_t mca_pls_proxy_component; #if defined(c_plusplus) || defined(__cplusplus) } diff --git a/orte/mca/pls/proxy/pls_proxy_component.c b/orte/mca/pls/proxy/pls_proxy_component.c index 15ba25b3c8..7dc8270922 100644 --- a/orte/mca/pls/proxy/pls_proxy_component.c +++ b/orte/mca/pls/proxy/pls_proxy_component.c @@ -38,7 +38,7 @@ /* * Struct of function pointers that need to be initialized */ -ORTE_MODULE_DECLSPEC orte_pls_base_component_t mca_pls_proxy_component = { +orte_pls_base_component_t mca_pls_proxy_component = { { ORTE_PLS_BASE_VERSION_1_3_0, diff --git a/orte/mca/pls/slurm/pls_slurm.h b/orte/mca/pls/slurm/pls_slurm.h index f8d7da2fb7..03a9b3fe56 100644 --- a/orte/mca/pls/slurm/pls_slurm.h +++ b/orte/mca/pls/slurm/pls_slurm.h @@ -42,7 +42,7 @@ extern "C" { * Globally exported variable */ - ORTE_DECLSPEC extern orte_pls_slurm_component_t + ORTE_MODULE_DECLSPEC extern orte_pls_slurm_component_t mca_pls_slurm_component; ORTE_DECLSPEC extern orte_pls_base_module_t orte_pls_slurm_module; diff --git a/orte/mca/pls/slurm/pls_slurm_component.c b/orte/mca/pls/slurm/pls_slurm_component.c index ea36574e83..f35d777998 100644 --- a/orte/mca/pls/slurm/pls_slurm_component.c +++ b/orte/mca/pls/slurm/pls_slurm_component.c @@ -57,7 +57,7 @@ static orte_pls_base_module_t *pls_slurm_init(int *priority); * and pointers to our public functions in it */ -ORTE_MODULE_DECLSPEC orte_pls_slurm_component_t mca_pls_slurm_component = { +orte_pls_slurm_component_t mca_pls_slurm_component = { { /* First, the mca_component_t struct containing meta diff --git a/orte/mca/rds/proxy/rds_proxy.h b/orte/mca/rds/proxy/rds_proxy.h index 6a71125671..e124f20cf7 100644 --- a/orte/mca/rds/proxy/rds_proxy.h +++ b/orte/mca/rds/proxy/rds_proxy.h @@ -49,7 +49,7 @@ int orte_rds_proxy_finalize(void); */ int orte_rds_proxy_query(orte_jobid_t job); -ORTE_DECLSPEC extern orte_rds_base_component_t mca_rds_proxy_component; +ORTE_MODULE_DECLSPEC extern orte_rds_base_component_t mca_rds_proxy_component; #if defined(c_plusplus) || defined(__cplusplus) } diff --git a/orte/mca/rds/proxy/rds_proxy_component.c b/orte/mca/rds/proxy/rds_proxy_component.c index 640bbbf0e9..17312e1bc1 100644 --- a/orte/mca/rds/proxy/rds_proxy_component.c +++ b/orte/mca/rds/proxy/rds_proxy_component.c @@ -38,7 +38,7 @@ /* * Struct of function pointers that need to be initialized */ -ORTE_MODULE_DECLSPEC orte_rds_base_component_t mca_rds_proxy_component = { +orte_rds_base_component_t mca_rds_proxy_component = { { ORTE_RDS_BASE_VERSION_1_3_0,