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

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

@@ -50 +50 @@
                             PJ_LOG_HAS_SPACE | PJ_LOG_HAS_THREAD_SWC |
                             PJ_LOG_HAS_INDENT
-#if defined(PJ_WIN32) && PJ_WIN32!=0
+#if (defined(PJ_WIN32) && PJ_WIN32!=0) || \
+    (defined(PJ_WIN64) && PJ_WIN64!=0)
                             | PJ_LOG_HAS_COLOR
 #endif
@@ -104 +105 @@
 {
     if (indent < 0) indent = 0;
-    pj_thread_local_set(thread_indent_tls_id, (void*)(long)indent);
+    pj_thread_local_set(thread_indent_tls_id, (void*)(pj_ssize_t)indent);
 }
 
 static int log_get_raw_indent()
 {
-    return (long)pj_thread_local_get(thread_indent_tls_id);
+    return (long)(pj_ssize_t)pj_thread_local_get(thread_indent_tls_id);
 }
 
@@ -268 +269 @@
     if (thread_suspended_tls_id != -1) 
     {
-        pj_thread_local_set(thread_suspended_tls_id, (void*)PJ_TRUE);
+        pj_thread_local_set(thread_suspended_tls_id, 
+                            (void*)(pj_ssize_t)PJ_TRUE);
     } 
     else
@@ -379 +381 @@
     if (log_decor & PJ_LOG_HAS_SENDER) {
         enum { SENDER_WIDTH = 14 };
-        int sender_len = strlen(sender);
+        pj_size_t sender_len = strlen(sender);
         if (pre!=log_buffer) *pre++ = ' ';
         if (sender_len <= SENDER_WIDTH) {
@@ -395 +397 @@
         enum { THREAD_WIDTH = 12 };
         const char *thread_name = pj_thread_get_name(pj_thread_this());
-        int thread_len = strlen(thread_name);
+        pj_size_t thread_len = strlen(thread_name);
         *pre++ = ' ';
         if (thread_len <= THREAD_WIDTH) {
@@ -434 +436 @@
 #endif
 
-    len = pre - log_buffer;
+    len = (int)(pre - log_buffer);
 
     /* Print the whole message to the string log_buffer. */