Changeset 4537 for pjproject/trunk/pjlib/src/pj/os_core_win32.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/pjlib/src/pj/os_core_win32.c (modified) (3 diffs)

pjproject/trunk/pjlib/src/pj/os_core_win32.c

@@ -409 +409 @@
     else
         pj_ansi_snprintf(thread->obj_name, sizeof(thread->obj_name), 
-                         "thr%p", (void*)thread->idthread);
+                         "thr%p", (void*)(pj_ssize_t)thread->idthread);
     
     rc = pj_thread_local_set(thread_tls_id, thread);
@@ -500 +500 @@
 
 #if defined(PJ_OS_HAS_CHECK_STACK) && PJ_OS_HAS_CHECK_STACK!=0
-    rec->stk_size = stack_size ? stack_size : 0xFFFFFFFFUL;
+    rec->stk_size = stack_size ? (pj_uint32_t)stack_size : 0xFFFFFFFFUL;
     rec->stk_max_usage = 0;
 #endif
@@ -635 +635 @@
 
     /* Calculate current usage. */
-    usage = (&stk_ptr > thread->stk_start) ? &stk_ptr - thread->stk_start :
-                thread->stk_start - &stk_ptr;
+    usage = (&stk_ptr > thread->stk_start) ? 
+                (pj_uint32_t)(&stk_ptr - thread->stk_start) :
+                (pj_uint32_t)(thread->stk_start - &stk_ptr);
 
     /* Assert if stack usage is dangerously high. */