diff options
| author | zuul <zuul@gerrit.asterisk.org> | 2016-06-22 19:23:16 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-06-22 19:23:16 -0500 |
| commit | 5a568df73d10e45c32cc9d59556b9114c1c669b9 (patch) | |
| tree | 4c1db8b07a2a96382e60b7050d48d4ea22f43c94 /res | |
| parent | b044195e31c2ab08ab17ab4023e7c642400a5e82 (diff) | |
| parent | 48db4c215924f2881f6eef79ae120f6a3166ad63 (diff) | |
Merge "res_rtp_asterisk: Fix a self-comparison identified by gcc 6" into 13
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_rtp_asterisk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c index bb4c0af1a..feab1ca80 100644 --- a/res/res_rtp_asterisk.c +++ b/res/res_rtp_asterisk.c @@ -540,8 +540,8 @@ static int ice_candidate_cmp(void *obj, void *arg, int flags) if (strcmp(candidate1->foundation, candidate2->foundation) || candidate1->id != candidate2->id || - ast_sockaddr_cmp(&candidate1->address, &candidate2->address) || - candidate1->type != candidate1->type) { + candidate1->type != candidate2->type || + ast_sockaddr_cmp(&candidate1->address, &candidate2->address)) { return 0; } |