diff options
| author | Joshua Colp <jcolp@digium.com> | 2016-06-22 20:16:03 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-06-22 20:16:03 -0500 |
| commit | 7a2daafa5922a42ce4da1e5051e125ba1c8aa138 (patch) | |
| tree | 0c4de11d70bc2180b3f9b91a8052b91822f3fdb0 | |
| parent | 1afb0c98a9bd92a1c6b8a9f4e5f109e26399265a (diff) | |
| parent | d293ead07726cd8cee8b5277c2536db7d50cbabd (diff) | |
Merge "res_rtp_asterisk: Fix a self-comparison identified by gcc 6"
| -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 119e45d87..79aab1697 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; } |