maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into x2

Browse Source 
Conflicts:
	cmake_targets/CMakeLists.txt
	openair2/ENB_APP/enb_app.c
	openair2/X2AP/x2ap_common.h
This commit is contained in:
Konstantinos Alexandris
2018-09-07 15:30:49 +02:00
parent 2b85c4a3a6 c8eb68d556
commit 938e0242e2
125 changed files with 6054 additions and 3311 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/X2AP/x2ap_common.h
+1 -2
View File
@@ -57,11 +57,10 @@
#define FALSE 0
#endif
extern int asn_debug;
extern int asn1_xer_print;
#if defined(ENB_MODE)
# include "log.h"
# include "common/utils/LOG/log.h"
# define X2AP_INFO(x, args...) LOG_I(X2AP, x, ##args)
# define X2AP_ERROR(x, args...) LOG_E(X2AP, x, ##args)
# define X2AP_WARN(x, args...) LOG_W(X2AP, x, ##args)