Merge branch 'develop' into feature-merge-f68

2018-02-08 18:05:28 +01:00
parent fcddbc2b44 be8d32d55f
commit a21bc513bb
401 changed files with 79094 additions and 33801 deletions
@@ -28,7 +28,6 @@ CFLAGS =            \
 	-Wall           \
 	-DENB_MODE      \
 	-DENABLE_USE_MME    \
-	-DUSER_MODE     \
 	-I.        \
 	-I$(ASN1MESSAGESDIR)/ASN1/$(ASN1RELDIR) \
 	-I$(ASN1MESSAGESDIR) \
@@ -33,10 +33,7 @@
 typedef struct x2ap_config_s {
 } x2ap_config_t;

-#if defined(OAI_EMU)
-#else
 extern x2ap_config_t x2ap_config;
-#endif

 void *x2ap_task(void *arg);