Changeset 4294

Timestamp:

Nov 6, 2012 5:02:10 AM (12 years ago)

Author:

nanang

Message:

Misc (re #1562): Fixed Symbian build errors on S60 5th edition SDK.

Location:

pjproject/trunk/pjsip/src

Files:

• pjsip/sip_transport_tcp.c (modified) (1 diff)
• pjsua-lib/pjsua_acc.c (modified) (1 diff)
• pjsua-lib/pjsua_pres.c (modified) (4 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transport_tcp.c

@@ -593 +593 @@
     tcp->base.key.type = listener->factory.type;
     pj_sockaddr_cp(&tcp->base.key.rem_addr, remote);
-    tcp->base.type_name = (char*)
-                          pjsip_transport_get_type_name(tcp->base.key.type);
-    tcp->base.flag = pjsip_transport_get_flag_from_type(tcp->base.key.type);
+    tcp->base.type_name = (char*)pjsip_transport_get_type_name(
+                                (pjsip_transport_type_e)tcp->base.key.type);
+    tcp->base.flag = pjsip_transport_get_flag_from_type(
+                                (pjsip_transport_type_e)tcp->base.key.type);
 
     tcp->base.info = (char*) pj_pool_alloc(pool, 64);

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

@@ -1606 +1606 @@
             pj_ansi_snprintf(transport_param, sizeof(transport_param),
                              ";transport=%s",
-                             pjsip_transport_get_type_name(tp->key.type));
+                             pjsip_transport_get_type_name(
+                                     (pjsip_transport_type_e)tp->key.type));
         } else {
             transport_param[0] = '\0';

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

@@ -886 +886 @@
                                    &via_tp) == PJ_SUCCESS)
         {
-            pjsip_dlg_set_via_sent_by(dlg, &via_addr, (void*)via_tp);
+            pjsip_dlg_set_via_sent_by(dlg, &via_addr,
+                                      (pjsip_transport*)via_tp);
         }
     }
@@ -1271 +1272 @@
         {
             pjsip_publishc_set_via_sent_by(acc->publish_sess, &via_addr,
-                                           (void*)via_tp);
+                                           (pjsip_transport*)via_tp);
         }
     }
@@ -1839 +1840 @@
                                    &via_tp) == PJ_SUCCESS)
         {
-            pjsip_dlg_set_via_sent_by(buddy->dlg, &via_addr, (void*)via_tp);
+            pjsip_dlg_set_via_sent_by(buddy->dlg, &via_addr,
+                                      (pjsip_transport*)via_tp);
         }
     }
@@ -2180 +2182 @@
         {
             pjsip_dlg_set_via_sent_by(acc->mwi_dlg, &via_addr,
-                                      (void*)via_tp);
+                                      (pjsip_transport*)via_tp);
         }
     }