From 81dcfc2d51afa5f30b91655e57adcc20fa5c17e7 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 21 Aug 2015 10:05:47 +0200 Subject: [PATCH] Remove min/max from test, using existing MIN/MAX --- tester/call_tester.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/tester/call_tester.c b/tester/call_tester.c index 6b3982a7d..cc1e24756 100644 --- a/tester/call_tester.c +++ b/tester/call_tester.c @@ -33,16 +33,6 @@ #endif #endif -int static min(int a, int b) { - if (a < b) return a; - return b; -} - -int static max(int a, int b) { - if (a < b) return b; - return a; -} - static void srtp_call(void); static char *create_filepath(const char *dir, const char *filename, const char *ext); @@ -4542,7 +4532,7 @@ static void call_with_custom_rtp_modifier(void) { ms_message("Marie sent %i RTP packets and received %i", data_marie->packetSentCount, data_marie->packetReceivedCount); ms_message("Pauline sent %i RTP packets and received %i", data_pauline->packetSentCount, data_pauline->packetReceivedCount); // There will be a few RTP packets sent on marie's side before the call is ended at pauline's request, so we need the threshold - BC_ASSERT_TRUE(max(data_pauline->packetReceivedCount, data_marie->packetSentCount) - min(data_pauline->packetReceivedCount, data_marie->packetSentCount) < 8); + BC_ASSERT_TRUE(MAX(data_pauline->packetReceivedCount, data_marie->packetSentCount) - MIN(data_pauline->packetReceivedCount, data_marie->packetSentCount) < 8); BC_ASSERT_TRUE(data_marie->packetReceivedCount == data_pauline->packetSentCount); end: