diff options
| author | Benny Prijono <bennylp@teluu.com> | 2010-08-11 06:03:47 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2010-08-11 06:03:47 +0000 |
| commit | eac79b106f7b928ef0ff06350f4486ae39008fc3 (patch) | |
| tree | f763eeb698946c2bd2bfba534e882bdd8a4f1f7a | |
| parent | 46dfd83eed46659d23790c39a17b4a3494440c98 (diff) | |
Misc (re #1068): fixed various compilation warnings with Visual Studio 6 and 2005
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3262 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjlib-util/src/pjlib-util-test/http_client.c | 2 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia-audiodev/audiodev.c | 2 | ||||
| -rw-r--r-- | pjnath/src/pjnath/ice_strans.c | 2 | ||||
| -rw-r--r-- | pjsip-apps/src/pjsystest/main_wm.c | 2 | ||||
| -rw-r--r-- | pjsip/src/pjsip/sip_transaction.c | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/pjlib-util/src/pjlib-util-test/http_client.c b/pjlib-util/src/pjlib-util-test/http_client.c index 8e73650c..b942a4d6 100644 --- a/pjlib-util/src/pjlib-util-test/http_client.c +++ b/pjlib-util/src/pjlib-util-test/http_client.c @@ -65,7 +65,7 @@ static int server_thread(void *p) { struct server_t *srv = (struct server_t*)p; char *pkt = (char*)pj_pool_alloc(pool, srv->buf_size); - pj_sock_t newsock; + pj_sock_t newsock = PJ_INVALID_SOCKET; while (!thread_quit) { pj_ssize_t pkt_len; diff --git a/pjmedia/src/pjmedia-audiodev/audiodev.c b/pjmedia/src/pjmedia-audiodev/audiodev.c index 0689cc94..2a5a8e67 100644 --- a/pjmedia/src/pjmedia-audiodev/audiodev.c +++ b/pjmedia/src/pjmedia-audiodev/audiodev.c @@ -452,7 +452,7 @@ pjmedia_aud_unregister_factory(pjmedia_aud_dev_factory_create_func_ptr adf) if (drv->create == adf) { for (j = drv->start_idx; j < drv->start_idx + drv->dev_cnt; j++) { - aud_subsys.dev_list[j] = PJMEDIA_AUD_INVALID_DEV; + aud_subsys.dev_list[j] = (pj_uint32_t)PJMEDIA_AUD_INVALID_DEV; } deinit_driver(i); diff --git a/pjnath/src/pjnath/ice_strans.c b/pjnath/src/pjnath/ice_strans.c index 1f7ca1e8..65c4f4ec 100644 --- a/pjnath/src/pjnath/ice_strans.c +++ b/pjnath/src/pjnath/ice_strans.c @@ -268,7 +268,7 @@ static pj_status_t add_update_turn(pj_ice_strans *ice_st, /* Also if this component's default candidate is set to relay, * move it temporarily to something else. */ - if (comp->default_cand == cand - comp->cand_list) { + if ((int)comp->default_cand == cand - comp->cand_list) { /* Init to something */ comp->default_cand = 0; /* Use srflx candidate as the default, if any */ diff --git a/pjsip-apps/src/pjsystest/main_wm.c b/pjsip-apps/src/pjsystest/main_wm.c index 374e84d6..b744e132 100644 --- a/pjsip-apps/src/pjsystest/main_wm.c +++ b/pjsip-apps/src/pjsystest/main_wm.c @@ -237,7 +237,7 @@ pj_status_t gui_init(gui_menu *menu) if (!RegisterClass(&wc) != 0) { DWORD err = GetLastError(); - return -1; + return PJ_RETURN_OS_ERROR(err); } /* Create the app. window */ diff --git a/pjsip/src/pjsip/sip_transaction.c b/pjsip/src/pjsip/sip_transaction.c index 999810d6..2e50c378 100644 --- a/pjsip/src/pjsip/sip_transaction.c +++ b/pjsip/src/pjsip/sip_transaction.c @@ -1861,6 +1861,8 @@ static void tsx_tp_state_callback( pjsip_transport *tp, pjsip_transport_state state, const pjsip_transport_state_info *info) { + PJ_UNUSED_ARG(tp); + if (state == PJSIP_TP_STATE_DISCONNECTED) { pjsip_transaction *tsx; struct tsx_lock_data lck; |