diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2015-03-27 06:17:27 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2015-03-27 06:17:27 +0000 |
| commit | 32669005e5809e7f0825bf3b0d0e79a7e30e0abf (patch) | |
| tree | dee3037a378929be3e83664b8d9d3bfcb7ce362b /pjsip | |
| parent | 51e1fcf85d019d80cb0b827ce7380a2c7ee9027f (diff) | |
Re #1828: Fixed misc compile warnings (on iOS).
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5035 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip')
| -rw-r--r-- | pjsip/src/pjsip-ua/sip_inv.c | 5 | ||||
| -rw-r--r-- | pjsip/src/pjsip/sip_transport_udp.c | 2 | ||||
| -rw-r--r-- | pjsip/src/pjsua2/media.cpp | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/pjsip/src/pjsip-ua/sip_inv.c b/pjsip/src/pjsip-ua/sip_inv.c index 357079af..ca17f7af 100644 --- a/pjsip/src/pjsip-ua/sip_inv.c +++ b/pjsip/src/pjsip-ua/sip_inv.c @@ -3636,8 +3636,9 @@ static pj_bool_t inv_check_secure_dlg(pjsip_inv_session *inv, if (pjsip_cfg()->endpt.disable_secure_dlg_check == PJ_FALSE && dlg->secure && e->body.tsx_state.type==PJSIP_EVENT_RX_MSG && - (tsx->role==PJSIP_ROLE_UAC && tsx->status_code/100 == 2 || - tsx->role==PJSIP_ROLE_UAS && tsx->state == PJSIP_TSX_STATE_TRYING) && + ((tsx->role==PJSIP_ROLE_UAC && tsx->status_code/100 == 2) || + (tsx->role==PJSIP_ROLE_UAS && tsx->state == PJSIP_TSX_STATE_TRYING)) + && (tsx->method.id==PJSIP_INVITE_METHOD || pjsip_method_cmp(&tsx->method, &pjsip_update_method)==0)) { diff --git a/pjsip/src/pjsip/sip_transport_udp.c b/pjsip/src/pjsip/sip_transport_udp.c index 38355b85..f11cafaf 100644 --- a/pjsip/src/pjsip/sip_transport_udp.c +++ b/pjsip/src/pjsip/sip_transport_udp.c @@ -153,7 +153,7 @@ static void udp_on_read_complete( pj_ioqueue_key_t *key, * is relatively big enough for a SIP packet. */ if (bytes_read > MIN_SIZE) { - pj_size_t size_eaten; + pj_ssize_t size_eaten; const pj_sockaddr *src_addr = &rdata->pkt_info.src_addr; /* Init pkt_info part. */ diff --git a/pjsip/src/pjsua2/media.cpp b/pjsip/src/pjsua2/media.cpp index ed963714..779bd945 100644 --- a/pjsip/src/pjsua2/media.cpp +++ b/pjsip/src/pjsua2/media.cpp @@ -1010,6 +1010,10 @@ int AudDevManager::getActiveDev(bool is_capture) const throw(Error) VideoWindow::VideoWindow(pjsua_vid_win_id win_id) : winId(win_id) { +#if !PJSUA_HAS_VIDEO + /* Suppress warning of unused field when video is disabled */ + PJ_UNUSED_ARG(winId); +#endif } VideoWindowInfo VideoWindow::getInfo() const throw(Error) |