From 6acfbe21e1b5d5748499ef1b3629704601189a8c Mon Sep 17 00:00:00 2001
From: Xu Bo <xubo1@cn.fujitsu.com>
Date: Sat, 13 Jan 2018 12:33:10 +0000
Subject: [PATCH] fix compiler error generated by merge
---
openair2/LAYER2/MAC/eNB_scheduler.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/openair2/LAYER2/MAC/eNB_scheduler.c b/openair2/LAYER2/MAC/eNB_scheduler.c
index aee6c1bf75..f1b1e274dc 100644
--- a/openair2/LAYER2/MAC/eNB_scheduler.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler.c
@@ -635,9 +635,7 @@ eNB_dlsch_ulsch_scheduler(module_id_t module_idP, frame_t frameP,
{
int mbsfn_status[MAX_NUM_CCs];
-#if (!defined(UE_EXPANSION_SIM2)) &&(!defined(UE_EXPANSION))
protocol_ctxt_t ctxt;
-#endif
int CC_id, i; //,next_i;
UE_list_t *UE_list = &RC.mac[module_idP]->UE_list;
--
GitLab