after merge, remain compile errors

cmake_targets/CMakeLists.txt

cmake_targets/build_oai

cmake_targets/tools/make_asn1c_includes.sh

common/ran_context.h

common/utils/telnetsrv/telnetsrv.h

executables/nr-ru.c

executables/nr-uesoftmodem.c

executables/nr-uesoftmodem.h

openair1/PHY/TOOLS/lte_phy_scope.h

openair1/PHY/TOOLS/nr_phy_scope.c

openair2/COMMON/mac_rrc_primitives.h

openair2/COMMON/tasks_def.h

openair2/ENB_APP/flexran_agent_ran_api.c

openair2/F1AP/f1ap_du_rrc_message_transfer.c

openair2/GNB_APP/gnb_config.h

openair2/RRC/LTE/L2_interface.c

openair2/RRC/LTE/rrc_UE.c

openair2/RRC/LTE/rrc_defs.h

openair2/RRC/LTE/rrc_eNB.c

openair2/RRC/LTE/rrc_eNB_GTPV1U.c