From f41502cd19703da6e85f5ea9a775f54b40627ef4 Mon Sep 17 00:00:00 2001
From: Thomas Schlichter <thomas.schlichter@iis.fraunhofer.de>
Date: Tue, 17 Nov 2020 17:30:40 +0100
Subject: [PATCH] fix compile warnings introduced by merge with develop

---
 executables/nr-gnb.c                          | 1 +
 openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/executables/nr-gnb.c b/executables/nr-gnb.c
index 7f01ce67450..bd4a1a72aa8 100644
--- a/executables/nr-gnb.c
+++ b/executables/nr-gnb.c
@@ -48,6 +48,7 @@
 #include "SCHED_NR/sched_nr.h"
 #include "SCHED_NR/fapi_nr_l1.h"
 #include "PHY/NR_TRANSPORT/nr_transport_proto.h"
+#include "PHY/MODULATION/nr_modulation.h"
 
 #undef MALLOC //there are two conflicting definitions, so we better make sure we don't use it at all
 //#undef FRAME_LENGTH_COMPLEX_SAMPLES //there are two conflicting definitions, so we better make sure we don't use it at all
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
index 1398d748e96..66dcfcff86b 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
@@ -421,7 +421,6 @@ void nr_initiate_ra_proc(module_id_t module_idP,
 
   uint8_t ul_carrier_id = 0; // 0 for NUL 1 for SUL
   NR_SearchSpace_t *ss;
-  int UE_id = 0;
 
   uint16_t msg2_frame, msg2_slot,monitoring_slot_period,monitoring_offset;
   gNB_MAC_INST *nr_mac = RC.nrmac[module_idP];
-- 
GitLab