Merge branch 'enhancement-rfsim' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-rfsim

openair2/RRC/LTE/rrc_eNB.c

@@ -37,6 +37,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"

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"

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"