Commit dad87f21 authored by winckel's avatar winckel

Fixed a build issue.

Fixed some warnings.

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4819 818b1a75-f10b-46b9-bf7c-635c3b92a50f
parent a94a6f38
...@@ -52,6 +52,9 @@ ...@@ -52,6 +52,9 @@
#include <getopt.h> #include <getopt.h>
#include "rt_wrapper.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 #ifdef EMOS
#include <gps.h> #include <gps.h>
...@@ -59,7 +62,11 @@ ...@@ -59,7 +62,11 @@
#include "PHY/types.h" #include "PHY/types.h"
#include "PHY/defs.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" #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 "PHY/vars.h"
#include "MAC_INTERFACE/vars.h" #include "MAC_INTERFACE/vars.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment