Changeset 5170 for pjproject/trunk/pjnath/src/pjnath/turn_session.c

Timestamp:

Aug 25, 2015 8:45:46 AM (9 years ago)

Author:

nanang

Message:

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

File:

• pjproject/trunk/pjnath/src/pjnath/turn_session.c (modified) (3 diffs)

pjproject/trunk/pjnath/src/pjnath/turn_session.c

@@ -1292 +1292 @@
     const pj_stun_sockaddr_attr *mapped_attr;
     pj_str_t s;
-    pj_time_val timeout;
 
     /* Must have LIFETIME attribute */
@@ -1397 +1396 @@
     /* Start keep-alive timer once allocation succeeds */
     if (sess->state < PJ_TURN_STATE_DEALLOCATING) {
+        pj_time_val timeout;
         timeout.sec = sess->ka_interval;
         timeout.msec = 0;
@@ -1772 +1772 @@
 
         if (bind_channel) {
-            pj_uint32_t hval = 0;
+            pj_uint32_t hval2 = 0;
             /* Register by channel number */
             pj_assert(ch->num != PJ_TURN_INVALID_CHANNEL && ch->bound);
 
             if (pj_hash_get(sess->ch_table, &ch->num, 
-                            sizeof(ch->num), &hval)==0) {
+                            sizeof(ch->num), &hval2)==0) {
                 pj_hash_set(sess->pool, sess->ch_table, &ch->num,
-                            sizeof(ch->num), hval, ch);
+                            sizeof(ch->num), hval2, ch);
             }
         }