From dad87f217cdbc05f2ed20607456dd41f1a5e10e6 Mon Sep 17 00:00:00 2001 From: winckel <winckel@eurecom.fr> Date: Thu, 2 Jan 2014 16:36:26 +0000 Subject: [PATCH] Fixed a build issue. Fixed some warnings. git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4819 818b1a75-f10b-46b9-bf7c-635c3b92a50f --- targets/RTAI/USER/lte-enb.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/targets/RTAI/USER/lte-enb.c b/targets/RTAI/USER/lte-enb.c index 11e696a872..d3cb424347 100644 --- a/targets/RTAI/USER/lte-enb.c +++ b/targets/RTAI/USER/lte-enb.c @@ -52,6 +52,9 @@ #include <getopt.h> #include "rt_wrapper.h" +#undef MALLOC //there are two conflicting definitions, so we better make sure we don't use it at all + +#include "assertions.h" #ifdef EMOS #include <gps.h> @@ -59,7 +62,11 @@ #include "PHY/types.h" #include "PHY/defs.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 + #include "openair0_lib.h" +#undef FRAME_LENGTH_COMPLEX_SAMPLES //there are two conflicting definitions, so we better make sure we don't use it at all #include "PHY/vars.h" #include "MAC_INTERFACE/vars.h" -- GitLab