Ignore:
Timestamp:
Aug 25, 2015 8:45:46 AM (6 years ago)
Author:
nanang
Message:

Re #1881: Fixed compile warnings on VS2015 about declaration hides previous declaration.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjnath/src/pjnath/turn_session.c

    r4606 r5170  
    12921292    const pj_stun_sockaddr_attr *mapped_attr; 
    12931293    pj_str_t s; 
    1294     pj_time_val timeout; 
    12951294 
    12961295    /* Must have LIFETIME attribute */ 
     
    13971396    /* Start keep-alive timer once allocation succeeds */ 
    13981397    if (sess->state < PJ_TURN_STATE_DEALLOCATING) { 
     1398        pj_time_val timeout; 
    13991399        timeout.sec = sess->ka_interval; 
    14001400        timeout.msec = 0; 
     
    17721772 
    17731773        if (bind_channel) { 
    1774             pj_uint32_t hval = 0; 
     1774            pj_uint32_t hval2 = 0; 
    17751775            /* Register by channel number */ 
    17761776            pj_assert(ch->num != PJ_TURN_INVALID_CHANNEL && ch->bound); 
    17771777 
    17781778            if (pj_hash_get(sess->ch_table, &ch->num,  
    1779                             sizeof(ch->num), &hval)==0) { 
     1779                            sizeof(ch->num), &hval2)==0) { 
    17801780                pj_hash_set(sess->pool, sess->ch_table, &ch->num, 
    1781                             sizeof(ch->num), hval, ch); 
     1781                            sizeof(ch->num), hval2, ch); 
    17821782            } 
    17831783        } 
Note: See TracChangeset for help on using the changeset viewer.