Merge remote-tracking branch 'origin/fix-compile' into develop-NR_SA_F1AP_5GRECORDS

# Conflicts: # cmake_targets/CMakeLists.txt # openair2/RRC/NR_UE/rrc_UE.c # openair2/SIMULATION/NR_RRC/itti_sim.c
2021-05-19 12:09:27 +01:00
parent a11ff65350 b5bbfdade3
commit 8c5725ed46
23 changed files with 151 additions and 220 deletions
@@ -72,9 +72,6 @@ extern uint64_t get_nrUE_optmask(void);
 extern uint64_t set_nrUE_optmask(uint64_t bitmask);
 extern nrUE_params_t *get_nrUE_params(void);

-#ifdef NRUE_MAIN
-nrUE_params_t nrUE_params;
-#endif

 // In nr-ue.c
 extern int setup_nr_ue_buffers(PHY_VARS_NR_UE **phy_vars_ue, openair0_config_t *openair0_cfg);