Fix name clashes between OAI and E2 Agent generated by the linker

2024-02-26 09:57:51 +01:00
parent 1adcd3fb5a
commit 1b237f6abe
4 changed files with 8 additions and 15 deletions
@@ -39,5 +39,5 @@ add_library(e2_ran_func_du_cucp_cuup STATIC
            ../flexric/test/rnd/fill_rnd_data_slice.c
            )

-target_link_libraries(e2_ran_func_du_cucp_cuup PUBLIC asn1_nr_rrc nr_rrc asn1_nr_rrc_hdrs e2_time_obj kpm_ric_info_common_obj 3gpp_derived_ie_obj e2sm_rc_ir_obj sm_common_ie_obj)
-target_compile_definitions(e2_ran_func_du_cucp_cuup PUBLIC ${E2AP_VERSION}  ${KPM_VERSION} NGRAN_GNB_DU NGRAN_GNB_CUCP NGRAN_GNB_CUUP)
+target_link_libraries(e2_ran_func_du_cucp_cuup PUBLIC asn1_nr_rrc nr_rrc asn1_nr_rrc_hdrs e2_time_obj kpm_ric_info_common_obj 3gpp_derived_ie_obj e2sm_rc_ir_obj sm_common_ie_obj e2_agent)
+target_compile_definitions(e2_ran_func_du_cucp_cuup PUBLIC ${E2AP_VERSION} ${KPM_VERSION} NGRAN_GNB_DU NGRAN_GNB_CUCP NGRAN_GNB_CUUP)
@@ -29,7 +29,7 @@ void read_setup_ran(void* data, const ngran_node_t node_type)
 {
  assert(data != NULL);
 #ifdef E2AP_V1
-
+  (void)node_type;
 #elif defined(E2AP_V2) || defined(E2AP_V3) 

  arr_node_component_config_add_t* dst = (arr_node_component_config_add_t*)data;