From 79de5295921483039bd489d69a355c6085d8bc35 Mon Sep 17 00:00:00 2001
From: Raymond Knopp <raymond.knopp@eurecom.fr>
Date: Mon, 4 Jun 2018 01:36:11 +0200
Subject: [PATCH] removed undef in lte-softmodem.h

---
 openair2/RRC/LTE/rrc_eNB.c      | 1 +
 targets/RT/USER/lte-softmodem.h | 2 +-
 targets/RT/USER/rfsim.h         | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/openair2/RRC/LTE/rrc_eNB.c b/openair2/RRC/LTE/rrc_eNB.c
index e3e6018445..aa4a27644c 100644
--- a/openair2/RRC/LTE/rrc_eNB.c
+++ b/openair2/RRC/LTE/rrc_eNB.c
@@ -35,6 +35,7 @@
 #include "assertions.h"
 #include "common/ran_context.h"
 #include "asn1_conversions.h"
+#include "asn_internal.h"
 #include "RRC/L2_INTERFACE/openair_rrc_L2_interface.h"
 #include "LAYER2/RLC/rlc.h"
 #include "LAYER2/MAC/mac_proto.h"
diff --git a/targets/RT/USER/lte-softmodem.h b/targets/RT/USER/lte-softmodem.h
index a109b1cee8..3888c46e84 100644
--- a/targets/RT/USER/lte-softmodem.h
+++ b/targets/RT/USER/lte-softmodem.h
@@ -24,7 +24,7 @@
 #include <sys/sysinfo.h>
 #include "rt_wrapper.h"
 #include "../../ARCH/COMMON/common_lib.h"
-#undef MALLOC
+//#undef MALLOC
 #include "assertions.h"
 #include "msc.h"
 #include "PHY/types.h"
diff --git a/targets/RT/USER/rfsim.h b/targets/RT/USER/rfsim.h
index 47c542ce81..c5361724c9 100644
--- a/targets/RT/USER/rfsim.h
+++ b/targets/RT/USER/rfsim.h
@@ -18,8 +18,8 @@
  * For more information about the OpenAirInterface (OAI) Software Alliance:
  *      contact@openairinterface.org
  */
-#ifndef __SIM__H__
-#define __SIM__H__
+#ifndef __RFSIM__H__
+#define __RFSIM__H__
 #include "lte-softmodem.h"
 #include "openair1/SIMULATION/TOOLS/sim.h"
 #include "platform_constants.h"
-- 
GitLab