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

Merge remote-tracking branch 'origin/282-flags-cleanup' into develop_integration_2018_w04

Browse Source 
Conflicts:
	openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
	openair1/SCHED/defs.h
	openair2/LAYER2/PDCP_v10.1.0/pdcp.c
	openair2/RRC/LITE/rrc_eNB.c
This commit is contained in:
Cedric Roux
2018-01-22 17:47:01 +01:00
parent b5513cadf1 9c93307ab4
commit 97ebc165cc
249 changed files with 102 additions and 28668 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/MAC/extern.h
-4
View File
@@ -32,10 +32,6 @@
#ifndef __MAC_EXTERN_H__
#define __MAC_EXTERN_H__
#ifdef USER_MODE
//#include "stdio.h"
#endif //USER_MODE
#include "PHY/defs.h"
#include "defs.h"