Changeset 4537 for pjproject/trunk/pjsip-apps/src/samples/pjsip-perf.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-apps/src/samples/pjsip-perf.c (modified) (10 diffs)

pjproject/trunk/pjsip-apps/src/samples/pjsip-perf.c

@@ -68 +68 @@
 #include <stdio.h>
 
-#if defined(PJ_WIN32) && PJ_WIN32!=0
+#if (defined(PJ_WIN32) && PJ_WIN32!=0) || (defined(PJ_WIN64) && PJ_WIN64!=0)
 #  include <windows.h>
 #endif
@@ -1007 +1007 @@
     } else if (inv->state == PJSIP_INV_STATE_DISCONNECTED) {
         report_completion(inv->cause);
-        inv->mod_data[mod_test.id] = (void*)1;
+        inv->mod_data[mod_test.id] = (void*)(pj_ssize_t)1;
     }
 }
@@ -1094 +1094 @@
     pj_pool_t *pool;
     char *url;
-    int len = (c_url ? pj_ansi_strlen(c_url) : 0);
+    pj_size_t len = (c_url ? pj_ansi_strlen(c_url) : 0);
 
     if (!len) return -1;
@@ -1371 +1371 @@
     if (tsx->state==PJSIP_TSX_STATE_TERMINATED) {
         report_completion(tsx->status_code);
-        tsx->mod_data[mod_test.id] = (void*)1;
+        tsx->mod_data[mod_test.id] = (void*)(pj_ssize_t)1;
     }
     else if (tsx->method.id == PJSIP_INVITE_METHOD &&
@@ -1377 +1377 @@
 
         report_completion(tsx->status_code);
-        tsx->mod_data[mod_test.id] = (void*)1;
+        tsx->mod_data[mod_test.id] = (void*)(pj_ssize_t)1;
         
     } else if (tsx->state == PJSIP_TSX_STATE_COMPLETED) {
 
         report_completion(tsx->status_code);
-        tsx->mod_data[mod_test.id] = (void*)1;
+        tsx->mod_data[mod_test.id] = (void*)(pj_ssize_t)1;
 
         TERMINATE_TSX(tsx, tsx->status_code);
@@ -1422 +1422 @@
 {
     pj_time_val end_time, last_report, now;
-    unsigned thread_index = (unsigned)(long)arg;
+    unsigned thread_index = (unsigned)(long)(pj_ssize_t)arg;
     unsigned cycle = 0, last_cycle = 0;
 
@@ -1579 +1579 @@
 {
     pj_time_val timeout = { 0, 1 };
-    unsigned thread_index = (unsigned)(long)arg;
+    unsigned thread_index = (unsigned)(long)(pj_ssize_t)arg;
     pj_time_val last_report, next_report;
 
@@ -1640 +1640 @@
     puts(msg);
 
-#if defined(PJ_WIN32) && PJ_WIN32!=0
+#if (defined(PJ_WIN32) && PJ_WIN32!=0) || (defined(PJ_WIN64) && PJ_WIN64!=0)
     OutputDebugString(msg);
     OutputDebugString("\n");
@@ -1716 +1716 @@
         for (i=0; i<app.thread_count; ++i) {
             status = pj_thread_create(app.pool, NULL, &client_thread, 
-                                      (void*)(long)i, 0, 0, &app.thread[i]);
+                                      (void*)(pj_ssize_t)i, 0, 0, 
+                                      &app.thread[i]);
             if (status != PJ_SUCCESS) {
                 app_perror(THIS_FILE, "Unable to create thread", status);
@@ -1825 +1826 @@
         for (i=0; i<app.thread_count; ++i) {
             status = pj_thread_create(app.pool, NULL, &server_thread, 
-                                      (void*)(long)i, 0, 0, &app.thread[i]);
+                                      (void*)(pj_ssize_t)i, 0, 0, 
+                                      &app.thread[i]);
             if (status != PJ_SUCCESS) {
                 app_perror(THIS_FILE, "Unable to create thread", status);