diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2015-08-25 08:45:46 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2015-08-25 08:45:46 +0000 |
| commit | 7ffa781dc39a7274692d8db11043b3a9e92e36ce (patch) | |
| tree | 77653933e1c211dbec6c125da9ec5c28f9eeaa4e /pjsip-apps/src/samples/stateful_proxy.c | |
| parent | 1b41ed3f7c9361106a585c1fe43d2338ab94cacc (diff) | |
Re #1881: Fixed compile warnings on VS2015 about declaration hides previous declaration.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5170 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip-apps/src/samples/stateful_proxy.c')
| -rw-r--r-- | pjsip-apps/src/samples/stateful_proxy.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pjsip-apps/src/samples/stateful_proxy.c b/pjsip-apps/src/samples/stateful_proxy.c index 3e870369..600ca942 100644 --- a/pjsip-apps/src/samples/stateful_proxy.c +++ b/pjsip-apps/src/samples/stateful_proxy.c @@ -247,7 +247,7 @@ static pj_bool_t proxy_on_rx_request( pjsip_rx_data *rdata ) } else { /* This is CANCEL request */ pjsip_transaction *invite_uas; - struct uas_data *uas_data; + struct uas_data *uas_data2; pj_str_t key; /* Find the UAS INVITE transaction */ @@ -269,17 +269,17 @@ static pj_bool_t proxy_on_rx_request( pjsip_rx_data *rdata ) * The UAS INVITE transaction will get final response when * we receive final response from the UAC INVITE transaction. */ - uas_data = (struct uas_data*) invite_uas->mod_data[mod_tu.id]; - if (uas_data->uac_tsx && uas_data->uac_tsx->status_code < 200) { + uas_data2 = (struct uas_data*) invite_uas->mod_data[mod_tu.id]; + if (uas_data2->uac_tsx && uas_data2->uac_tsx->status_code < 200) { pjsip_tx_data *cancel; - pj_grp_lock_acquire(uas_data->uac_tsx->grp_lock); + pj_grp_lock_acquire(uas_data2->uac_tsx->grp_lock); - pjsip_endpt_create_cancel(global.endpt, uas_data->uac_tsx->last_tx, + pjsip_endpt_create_cancel(global.endpt, uas_data2->uac_tsx->last_tx, &cancel); pjsip_endpt_send_request(global.endpt, cancel, -1, NULL, NULL); - pj_grp_lock_release(uas_data->uac_tsx->grp_lock); + pj_grp_lock_release(uas_data2->uac_tsx->grp_lock); } /* Unlock UAS tsx because it is locked in find_tsx() */ |