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

Merge remote-tracking branch 'origin/remove_targets_arch' into integration_2022_wk39

Browse Source
This commit is contained in:
Robert Schmidt
2022-09-27 19:13:35 +02:00
parent d867b4a1c1 69f8b9d9e8
commit b2ea7c5f1a
90 changed files with 118 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executables/nr-softmodem.c
+2 -2
View File
@@ -39,8 +39,8 @@
#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 "../../ARCH/COMMON/common_lib.h"
#include "../../ARCH/ETHERNET/USERSPACE/LIB/if_defs.h"
#include "sdr/COMMON/common_lib.h"
#include "sdr/ETHERNET/USERSPACE/LIB/if_defs.h"
//#undef FRAME_LENGTH_COMPLEX_SAMPLES //there are two conflicting definitions, so we better make sure we don't use it at all