Re #1680: Add initial support for Win64

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

5 files changed, 22 insertions, 18 deletions

diff --git a/pjsip/src/test/msg_test.c b/pjsip/src/test/msg_test.c
index 51d002db..e0448462 100644
--- a/pjsip/src/test/msg_test.c
+++ b/pjsip/src/test/msg_test.c
@@ -247,7 +247,7 @@ static pj_status_t test_entry( pj_pool_t *pool, struct test_msg *entry )
     pjsip_msg *parsed_msg, *ref_msg = NULL;
     static pjsip_msg *print_msg;
     pj_status_t status = PJ_SUCCESS;
-    int len;
+    pj_ssize_t len;
     pj_str_t str1, str2;
     pjsip_hdr *hdr1, *hdr2;
     pj_timestamp t1, t2;
@@ -809,7 +809,7 @@ static pjsip_msg *create_msg1(pj_pool_t *pool)
 	"c=IN IP4 pc33.atlanta.com\r\n"
 	"m=audio 3456 RTP/AVP 0 1 3 99\r\n"
 	"a=rtpmap:0 PCMU/8000\r\n";
-    body->len = pj_ansi_strlen((const char*) body->data);
+    body->len = (unsigned)pj_ansi_strlen((const char*) body->data);
     body->print_body = &pjsip_print_text_body;
 
     return msg;
@@ -1888,7 +1888,8 @@ static int hdr_test(void)
     for (i=0; i<PJ_ARRAY_SIZE(hdr_test_data); ++i) {
 	struct hdr_test_t  *test = &hdr_test_data[i];
 	pj_str_t hname;
-	int len, parsed_len;
+	pj_size_t len;
+	int parsed_len;
 	pj_pool_t *pool;
 	pjsip_hdr *parsed_hdr1=NULL, *parsed_hdr2=NULL;
 	char *input, *output;
@@ -1994,7 +1995,8 @@ int msg_test(void)
 	unsigned parse;
 	unsigned print;
     } run[COUNT];
-    unsigned i, max, avg_len;
+    unsigned i, max;
+    int avg_len;
     char desc[250];
     pj_status_t status;
 
@@ -2016,7 +2018,7 @@ int msg_test(void)
 
     /* Calculate average message length */
     for (i=0, avg_len=0; i<PJ_ARRAY_SIZE(test_array); ++i) {
-	avg_len += test_array[i].len;
+	avg_len += (int)test_array[i].len;
     }
     avg_len /= PJ_ARRAY_SIZE(test_array);
 
diff --git a/pjsip/src/test/transport_test.c b/pjsip/src/test/transport_test.c
index a1cb6056..ab22c5ef 100644
--- a/pjsip/src/test/transport_test.c
+++ b/pjsip/src/test/transport_test.c
@@ -163,7 +163,7 @@ static void send_msg_callback(pjsip_send_state *stateless_data,
 
     if (sent < 1) {
 	/* Obtain the error code. */
-	send_status = -sent;
+	send_status = (int)-sent;
     } else {
 	send_status = PJ_SUCCESS;
     }
@@ -415,7 +415,7 @@ static pj_status_t rt_send_request(int thread_id)
 	pjsip_endpt_cancel_timer(endpt, &rt_test_data[thread_id].timeout_timer);
     }
     timeout_delay.sec = 100; timeout_delay.msec = 0;
-    rt_test_data[thread_id].timeout_timer.user_data = (void*)1;
+    rt_test_data[thread_id].timeout_timer.user_data = (void*)(pj_ssize_t)1;
     pjsip_endpt_schedule_timer(endpt, &rt_test_data[thread_id].timeout_timer,
 			       &timeout_delay);
 
@@ -445,7 +445,7 @@ static pj_bool_t rt_on_rx_response(pjsip_rx_data *rdata)
 	if (!rt_stop) {
 	    pj_time_val tx_delay = { 0, 0 };
 	    pj_assert(rt_test_data[thread_id].tx_timer.user_data == NULL);
-	    rt_test_data[thread_id].tx_timer.user_data = (void*)1;
+	    rt_test_data[thread_id].tx_timer.user_data = (void*)(pj_ssize_t)1;
 	    pjsip_endpt_schedule_timer(endpt, &rt_test_data[thread_id].tx_timer,
 				       &tx_delay);
 	}
@@ -468,7 +468,7 @@ static void rt_timeout_timer( pj_timer_heap_t *timer_heap,
     
     if (rt_test_data[entry->id].tx_timer.user_data == NULL) {
 	pj_time_val delay = { 0, 0 };
-	rt_test_data[entry->id].tx_timer.user_data = (void*)1;
+	rt_test_data[entry->id].tx_timer.user_data = (void*)(pj_ssize_t)1;
 	pjsip_endpt_schedule_timer(endpt, &rt_test_data[entry->id].tx_timer,
 				   &delay);
     }
@@ -585,7 +585,8 @@ int transport_rt_test( pjsip_transport_type_e tp_type,
 	}
 
 	/* Create thread, suspended. */
-	status = pj_thread_create(pool, "rttest%p", &rt_worker_thread, (void*)(long)i, 0,
+	status = pj_thread_create(pool, "rttest%p", &rt_worker_thread, 
+				  (void*)(pj_ssize_t)i, 0,
 				  PJ_THREAD_SUSPENDED, &rt_test_data[i].thread);
 	if (status != PJ_SUCCESS) {
 	    app_perror("   error: unable to create thread", status);
@@ -599,7 +600,7 @@ int transport_rt_test( pjsip_transport_type_e tp_type,
 	pj_thread_resume(rt_test_data[i].thread);
 
 	/* Schedule first message transmissions. */
-	rt_test_data[i].tx_timer.user_data = (void*)1;
+	rt_test_data[i].tx_timer.user_data = (void*)(pj_ssize_t)1;
 	pjsip_endpt_schedule_timer(endpt, &rt_test_data[i].tx_timer, &delay);
     }
 
diff --git a/pjsip/src/test/tsx_basic_test.c b/pjsip/src/test/tsx_basic_test.c
index 2de73d75..baae9fd3 100644
--- a/pjsip/src/test/tsx_basic_test.c
+++ b/pjsip/src/test/tsx_basic_test.c
@@ -160,7 +160,7 @@ int tsx_basic_test(struct tsx_test_param *param)
 
 struct tsx_test_state
 {
-    int pool_cnt;
+    pj_size_t pool_cnt;
 };
 
 static void save_tsx_test_state(struct tsx_test_state *st)
diff --git a/pjsip/src/test/txdata_test.c b/pjsip/src/test/txdata_test.c
index 6e87b86d..f7f73651 100644
--- a/pjsip/src/test/txdata_test.c
+++ b/pjsip/src/test/txdata_test.c
@@ -431,7 +431,7 @@ static int txdata_test_uri_params(void)
     pjsip_via_hdr *via;
     pjsip_parser_err_report err_list;
     pjsip_msg *msg;
-    int len;
+    pj_ssize_t len;
     pj_status_t status;
 
     PJ_LOG(3,(THIS_FILE, "   header param in URI to create request"));
diff --git a/pjsip/src/test/uri_test.c b/pjsip/src/test/uri_test.c
index eda3c0e9..c647764c 100644
--- a/pjsip/src/test/uri_test.c
+++ b/pjsip/src/test/uri_test.c
@@ -1039,7 +1039,8 @@ int uri_test(void)
 	unsigned print;
 	unsigned cmp;
     } run[COUNT];
-    unsigned i, max, avg_len;
+    unsigned i, max;
+    pj_ssize_t avg_len;
     char desc[200];
     pj_status_t status;
 
@@ -1074,12 +1075,12 @@ int uri_test(void)
 			  "<tt>pjsip_parse_uri()</tt> per second "
 			  "(tested with %d URI set, with average length of "
 			  "%d chars)",
-			  (int)PJ_ARRAY_SIZE(uri_test_array), avg_len);
+			  (int)PJ_ARRAY_SIZE(uri_test_array), (int)avg_len);
 
     report_ival("uri-parse-per-sec", max, "URI/sec", desc);
 
     /* URI parsing bandwidth */
-    report_ival("uri-parse-bandwidth-mb", avg_len*max/1000000, "MB/sec",
+    report_ival("uri-parse-bandwidth-mb", (int)avg_len*max/1000000, "MB/sec",
 	        "URI parsing bandwidth in megabytes (number of megabytes "
 		"worth of URI that can be parsed per second)");
 
@@ -1094,7 +1095,7 @@ int uri_test(void)
 			  "<tt>pjsip_uri_print()</tt> per second "
 			  "(tested with %d URI set, with average length of "
 			  "%d chars)",
-			  (int)PJ_ARRAY_SIZE(uri_test_array), avg_len);
+			  (int)PJ_ARRAY_SIZE(uri_test_array), (int)avg_len);
 
     report_ival("uri-print-per-sec", max, "URI/sec", desc);
 
@@ -1108,7 +1109,7 @@ int uri_test(void)
 			  "<tt>pjsip_uri_cmp()</tt> per second "
 			  "(tested with %d URI set, with average length of "
 			  "%d chars)",
-			  (int)PJ_ARRAY_SIZE(uri_test_array), avg_len);
+			  (int)PJ_ARRAY_SIZE(uri_test_array), (int)avg_len);
 
     report_ival("uri-cmp-per-sec", max, "URI/sec", desc);