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

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4294 74dad513-b988-da41-8d7b-12977e46ad98

3 files changed, 12 insertions, 8 deletions

diff --git a/pjsip/src/pjsip/sip_transport_tcp.c b/pjsip/src/pjsip/sip_transport_tcp.c
index 8fd6c152..c9ca331a 100644
--- a/pjsip/src/pjsip/sip_transport_tcp.c
+++ b/pjsip/src/pjsip/sip_transport_tcp.c
@@ -592,9 +592,10 @@ static pj_status_t tcp_create( struct tcp_listener *listener,
 
     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);
     pj_ansi_snprintf(tcp->base.info, 64, "%s to %s",
diff --git a/pjsip/src/pjsua-lib/pjsua_acc.c b/pjsip/src/pjsua-lib/pjsua_acc.c
index 105e24d1..14575f56 100644
--- a/pjsip/src/pjsua-lib/pjsua_acc.c
+++ b/pjsip/src/pjsua-lib/pjsua_acc.c
@@ -1605,7 +1605,8 @@ static pj_bool_t acc_check_nat_addr(pjsua_acc *acc,
 	{
 	    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';
 	}
diff --git a/pjsip/src/pjsua-lib/pjsua_pres.c b/pjsip/src/pjsua-lib/pjsua_pres.c
index cad7c254..47bcd4bc 100644
--- a/pjsip/src/pjsua-lib/pjsua_pres.c
+++ b/pjsip/src/pjsua-lib/pjsua_pres.c
@@ -885,7 +885,8 @@ static pj_bool_t pres_on_rx_request(pjsip_rx_data *rdata)
 				   &via_addr, NULL, NULL,
 				   &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);
 	}
     }
 
@@ -1270,7 +1271,7 @@ static pj_status_t send_publish(int acc_id, pj_bool_t active)
 				   &via_tp) == PJ_SUCCESS)
         {
 	    pjsip_publishc_set_via_sent_by(acc->publish_sess, &via_addr,
-	                                   (void*)via_tp);
+	                                   (pjsip_transport*)via_tp);
         }
     }
 
@@ -1838,7 +1839,8 @@ static void subscribe_buddy_presence(pjsua_buddy_id buddy_id)
 				   &via_addr, NULL, NULL,
 				   &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);
         }
     }
 
@@ -2179,7 +2181,7 @@ pj_status_t pjsua_start_mwi(pjsua_acc_id acc_id, pj_bool_t force_renew)
    				   &via_tp) == PJ_SUCCESS)
    	{
    	    pjsip_dlg_set_via_sent_by(acc->mwi_dlg, &via_addr,
-   	                              (void*)via_tp);
+   	                              (pjsip_transport*)via_tp);
    	}
     }