From 7efce1684332f837d3f4d46b88e4b2035f86565d Mon Sep 17 00:00:00 2001 From: Dmytro Bogovych Date: Wed, 6 Feb 2019 12:26:20 +0300 Subject: [PATCH] - adopt latest fixes for pvqa-server build --- src/libs/ice/ICECheckList.cpp | 1 - src/libs/libevs/basic_op/stl.h | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/libs/ice/ICECheckList.cpp b/src/libs/ice/ICECheckList.cpp index ac30fcb0..27c3d372 100644 --- a/src/libs/ice/ICECheckList.cpp +++ b/src/libs/ice/ICECheckList.cpp @@ -11,7 +11,6 @@ #include #include #include -#include using namespace ice; #define LOG_SUBSYSTEM "ICE" diff --git a/src/libs/libevs/basic_op/stl.h b/src/libs/libevs/basic_op/stl.h index 9cb278f1..740447c5 100755 --- a/src/libs/libevs/basic_op/stl.h +++ b/src/libs/libevs/basic_op/stl.h @@ -34,16 +34,16 @@ * would be missing from the tree. */ extern int check_stack(const char*, const char*); #define STACK_DEPTH_FCT_CALL (BASOP_push_wmops(__FUNCTION__), check_stack( __FILE__, __FUNCTION__)) -#define STACK_DEPTH_FCT_RETURN (BASOP_pop_wmops(), check_stack("-"__FILE__, __FUNCTION__)) +//#define STACK_DEPTH_FCT_RETURN (BASOP_pop_wmops(), check_stack("-"__FILE__, __FUNCTION__)) #include /* for size_t */ extern void* check_alloc_in(const char*, const char *, size_t, size_t); extern void check_alloc_out(void*); extern void check_alloc_exit(void); -#define MALLOC_FCT_CALL(n1) check_alloc_in("m"__FILE__, __FUNCTION__, n1, 0) -#define CALLOC_FCT_CALL(n1, n2) check_alloc_in("c"__FILE__, __FUNCTION__, n1, n2) -#define FREE_FCT_CALL(ptr) check_alloc_out(ptr) +//#define MALLOC_FCT_CALL(n1) check_alloc_in("m"##__FILE__, __FUNCTION__, n1, 0) +//#define CALLOC_FCT_CALL(n1, n2) check_alloc_in("c"##__FILE__, __FUNCTION__, n1, n2) +//#define FREE_FCT_CALL(ptr) check_alloc_out(ptr) /* both ALLOW_40bits and ALLOW_ENH_UL32 shall be enabled for the EVS codec. */ #define ALLOW_40bits /* allow 32x16 and 32x32 multiplications */