Changeset 4537 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c

Timestamp:

Jun 19, 2013 6:47:43 AM (11 years ago)

Author:

riza

Message:

Re #1680: Add initial support for Win64

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c (modified) (7 diffs)

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

@@ -300 +300 @@
 #if PJSUA_ADD_ICE_TAGS
     if (acc_cfg->ice_cfg.enable_ice) {
-        unsigned new_len;
+        pj_ssize_t new_len;
         pj_str_t new_prm;
 
@@ -321 +321 @@
         if (acc_cfg->rfc5626_instance_id.slen==0) {
             const pj_str_t *hostname;
-            pj_uint32_t hval, pos;
+            pj_uint32_t hval;
+            pj_size_t pos;
             char instprm[] = ";+sip.instance=\"<urn:uuid:00000000-0000-0000-0000-0000CCDDEEFF>\"";
 
             hostname = pj_gethostname();
             pos = pj_ansi_strlen(instprm) - 10;
-            hval = pj_hash_calc(0, hostname->ptr, hostname->slen);
+            hval = pj_hash_calc(0, hostname->ptr, (unsigned)hostname->slen);
             pj_val_to_hex_digit( ((char*)&hval)[0], instprm+pos+0);
             pj_val_to_hex_digit( ((char*)&hval)[1], instprm+pos+2);
@@ -335 +336 @@
         } else {
             const char *prmname = ";+sip.instance=\"";
-            unsigned len;
+            pj_size_t len;
 
             len = pj_ansi_strlen(prmname) + acc_cfg->rfc5626_instance_id.slen + 1;
@@ -351 +352 @@
         } else {
             const char *prmname = ";reg-id=";
-            unsigned len;
+            pj_size_t len;
 
             len = pj_ansi_strlen(prmname) + acc_cfg->rfc5626_reg_id.slen;
@@ -998 +999 @@
     /* Global outbound proxy */
     if (global_route_crc != acc->global_route_crc) {
-        unsigned i, rcnt;
+        unsigned i;
+        pj_size_t rcnt;
 
         /* Remove the outbound proxies from the route set */
@@ -1363 +1365 @@
          * reg-id parameters.
          */
-        unsigned len;
+        pj_ssize_t len;
         pj_str_t reg_contact;
 
@@ -1683 +1685 @@
     const pj_str_t HROUTE = { "Route", 5 };
     pjsip_uri *uri[PJSUA_ACC_MAX_PROXIES];
-    unsigned i, uri_cnt = 0, rcnt;
+    unsigned i, uri_cnt = 0;
+    pj_size_t rcnt;
 
     /* Find and parse Service-Route headers */