Changeset 5170 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.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/pjsip/src/pjsua-lib/pjsua_core.c (modified) (3 diffs)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

@@ -907 +907 @@
     if (ua_cfg->nameserver_count) {
 #if PJSIP_HAS_RESOLVER
-        unsigned i;
+        unsigned ii;
 
         /* Create DNS resolver */
@@ -934 +934 @@
 
         /* Print nameservers */
-        for (i=0; i<ua_cfg->nameserver_count; ++i) {
+        for (ii=0; ii<ua_cfg->nameserver_count; ++ii) {
             PJ_LOG(4,(THIS_FILE, "Nameserver %.*s added",
-                      (int)ua_cfg->nameserver[i].slen,
-                      ua_cfg->nameserver[i].ptr));
+                      (int)ua_cfg->nameserver[ii].slen,
+                      ua_cfg->nameserver[ii].ptr));
         }
 #else
@@ -1100 +1100 @@
     /* Start worker thread if needed. */
     if (pjsua_var.ua_cfg.thread_cnt) {
-        unsigned i;
+        unsigned ii;
 
         if (pjsua_var.ua_cfg.thread_cnt > PJ_ARRAY_SIZE(pjsua_var.thread))
             pjsua_var.ua_cfg.thread_cnt = PJ_ARRAY_SIZE(pjsua_var.thread);
 
-        for (i=0; i<pjsua_var.ua_cfg.thread_cnt; ++i) {
+        for (ii=0; ii<pjsua_var.ua_cfg.thread_cnt; ++ii) {
             status = pj_thread_create(pjsua_var.pool, "pjsua", &worker_thread,
-                                      NULL, 0, 0, &pjsua_var.thread[i]);
+                                      NULL, 0, 0, &pjsua_var.thread[ii]);
             if (status != PJ_SUCCESS)
                 goto on_error;