Merge remote-tracking branch 'origin/develop' into bugfix-48-L1L2signaling
Conflicts: openair1/PHY/LTE_ESTIMATION/lte_eNB_measurements.c openair1/PHY/LTE_TRANSPORT/dlsch_coding.c openair1/SCHED/phy_procedures_lte_eNb.c openair2/LAYER2/MAC/config.c openair2/LAYER2/MAC/pre_processor.c openair2/LAYER2/openair2_proc.c openair2/RRC/LITE/rrc_eNB.c openair3/NAS/UE/API/USIM/usim_api.c openair3/NAS/UE/ESM/esm_ebr_context.c
This commit is contained in:
@@ -698,6 +698,10 @@ void logRecord_mt(const char *file, const char *func, int line, int comp,
|
||||
char *log_start;
|
||||
char *log_end;
|
||||
|
||||
/* for no gcc warnings */
|
||||
(void)log_start;
|
||||
(void)log_end;
|
||||
|
||||
c = &g_log->log_component[comp];
|
||||
|
||||
// do not apply filtering for LOG_F
|
||||
@@ -971,6 +975,10 @@ void logRecord_mt(const char *file, const char *func, int line, int comp,
|
||||
*/
|
||||
char log_buffer[MAX_LOG_TOTAL];
|
||||
|
||||
/* for no gcc warnings */
|
||||
(void)log_start;
|
||||
(void)log_end;
|
||||
|
||||
c = &g_log->log_component[comp];
|
||||
|
||||
// do not apply filtering for LOG_F
|
||||
|
||||
Reference in New Issue
Block a user