Merge "res_rtp_asterisk: Fix a self-comparison identified by gcc 6"

This commit is contained in:
Joshua Colp
2016-06-22 20:16:03 -05:00
committed by Gerrit Code Review

View File

@@ -540,8 +540,8 @@ static int ice_candidate_cmp(void *obj, void *arg, int flags)
if (strcmp(candidate1->foundation, candidate2->foundation) || if (strcmp(candidate1->foundation, candidate2->foundation) ||
candidate1->id != candidate2->id || candidate1->id != candidate2->id ||
ast_sockaddr_cmp(&candidate1->address, &candidate2->address) || candidate1->type != candidate2->type ||
candidate1->type != candidate1->type) { ast_sockaddr_cmp(&candidate1->address, &candidate2->address)) {
return 0; return 0;
} }