diff --git a/exec/amf.c b/exec/amf.c index c7d3cd79..e5a65562 100644 --- a/exec/amf.c +++ b/exec/amf.c @@ -434,11 +434,12 @@ struct openais_service_handler *amf_get_handler_ver0 (void) { return (&amf_service_handler); } + static void register_this_component (void) { lcr_component_register (&amf_comp_ver0); } -static void (*const __init_this_component[1]) (void) __attribute__ ((section(".ctors"))) = { register_this_component }; +void (*const __init_this_component[1]) (void) __attribute__ ((section(".ctors"))) = { register_this_component }; enum clc_command_run_operation_type { CLC_COMMAND_RUN_OPERATION_TYPE_INSTANTIATE = 1, diff --git a/exec/cfg.c b/exec/cfg.c index 5ad7d25d..4bbc8587 100644 --- a/exec/cfg.c +++ b/exec/cfg.c @@ -178,11 +178,10 @@ struct openais_service_handler *cfg_get_handler_ver0 (void) return (&cfg_service_handler); } static void register_this_component (void) { -printf ("registering cfg component\n"); lcr_component_register (&cfg_comp_ver0); } -static void (*const __init_this_component[1]) (void) __attribute__ ((section(".ctors"))) = { register_this_component }; +void (*const __ctor_cfg_comp[1]) (void) __attribute__ ((section(".ctors"))) = { register_this_component }; /* IMPL */ diff --git a/exec/ckpt.c b/exec/ckpt.c index 3260dbed..42202141 100644 --- a/exec/ckpt.c +++ b/exec/ckpt.c @@ -536,7 +536,7 @@ static void register_this_component (void) { lcr_component_register (&ckpt_comp_ver0); } -static void (*const __init_this_component[1]) (void) __attribute__ ((section(".ctors"))) = { register_this_component }; +void (*const __ctor_ckpt_comp[1]) (void) __attribute__ ((section(".ctors"))) = { register_this_component }; /* * All data types used for executive messages diff --git a/exec/clm.c b/exec/clm.c index f2f46783..c4a55462 100644 --- a/exec/clm.c +++ b/exec/clm.c @@ -244,7 +244,7 @@ static void clm_comp_register (void) { lcr_component_register (&clm_comp_ver0); } -static void (*const __ctor_clm_comp[1]) (void) __attribute__ ((section(".ctors"))) = { clm_comp_register }; +void (*const __ctor_clm_comp[1]) (void) __attribute__ ((section(".ctors"))) = { clm_comp_register }; struct req_exec_clm_nodejoin { struct req_header header; diff --git a/exec/evs.c b/exec/evs.c index 6d41849d..c327048e 100644 --- a/exec/evs.c +++ b/exec/evs.c @@ -197,7 +197,7 @@ static void evs_comp_register (void) { lcr_component_register (&evs_comp_ver0); } -static void (*const __ctor_evs_comp[1]) (void) __attribute__ ((section(".ctors"))) = { evs_comp_register }; +void (*const __ctor_evs_comp[1]) (void) __attribute__ ((section(".ctors"))) = { evs_comp_register }; struct res_evs_confchg_callback res_evs_confchg_callback; diff --git a/exec/evt.c b/exec/evt.c index 16fd4b98..99c4c0e6 100644 --- a/exec/evt.c +++ b/exec/evt.c @@ -262,7 +262,7 @@ static void evt_comp_register (void) { lcr_component_register (&evt_comp_ver0); } -static void (*const __ctor_evt_comp[1]) (void) __attribute__ ((section(".ctors"))) = { evt_comp_register }; +void (*const __ctor_evt_comp[1]) (void) __attribute__ ((section(".ctors"))) = { evt_comp_register }; /* * list of all retained events diff --git a/exec/lck.c b/exec/lck.c index 9681d9e6..295893c5 100644 --- a/exec/lck.c +++ b/exec/lck.c @@ -336,7 +336,7 @@ static void register_this_component (void) { lcr_component_register (&lck_comp_ver0); } -static void (*const __init_this_component[1]) (void) __attribute__ ((section(".ctors"))) = { register_this_component }; +void (*const __lck_ctor_comp[1]) (void) __attribute__ ((section(".ctors"))) = { register_this_component }; /* * All data types used for executive messages diff --git a/exec/msg.c b/exec/msg.c index c70d1b2c..eafd1c62 100644 --- a/exec/msg.c +++ b/exec/msg.c @@ -485,7 +485,7 @@ static void register_this_component (void) { lcr_component_register (&msg_comp_ver0); } -static void (*const __init_this_component[1]) (void) __attribute__ ((section(".ctors"))) = { register_this_component }; +void (*const __ctor_msg_comp[1]) (void) __attribute__ ((section(".ctors"))) = { register_this_component }; /* * All data types used for executive messages diff --git a/lcr/libtest_a.c b/lcr/libtest_a.c index 40d6bfd2..498e159c 100644 --- a/lcr/libtest_a.c +++ b/lcr/libtest_a.c @@ -160,4 +160,4 @@ static void register_this_component (void) { lcr_component_register (&test_comp); } -static void (*const __init_this_component[1]) (void) __attribute__ ((section(".ctors"))) = { register_this_component }; +void (*const __init_libtest_a[1]) (void) __attribute__ ((section(".ctors"))) = { register_this_component }; diff --git a/lcr/libtest_b.c b/lcr/libtest_b.c index 694126f1..c9d54d64 100644 --- a/lcr/libtest_b.c +++ b/lcr/libtest_b.c @@ -167,5 +167,5 @@ static void register_this_component (void) lcr_component_register (&test_comp); } -static void (*const __init_this_component[1]) (void) __attribute__ ((section(".ctors"))) = { register_this_component }; +void (*const __init_libtest_b[1]) (void) __attribute__ ((section(".ctors"))) = { register_this_component };