Fix Windows build using portable types for formatting the log outputs

llvm-svn: 202723

3 files changed, 16 insertions, 16 deletions

diff --git a/lldb/source/API/SBData.cpp b/lldb/source/API/SBData.cpp
index 06dcfc12af4..20092c0e0e1 100644
--- a/lldb/source/API/SBData.cpp
+++ b/lldb/source/API/SBData.cpp
@@ -122,7 +122,7 @@ SBData::GetByteSize ()
         value = m_opaque_sp->GetByteSize();
     if (log)
         log->Printf ("SBData::GetByteSize () => "
-                     "(%zu)", value);
+                     "( %" PRId64 " )", value);
     return value;
 }
 
@@ -479,7 +479,7 @@ SBData::ReadRawData (lldb::SBError& error,
             error.SetErrorString("unable to read data");
     }
     if (log)
-        log->Printf ("SBData::ReadRawData (error=%p,offset=%" PRIu64 ",buf=%p,size=%zu) => "
+        log->Printf("SBData::ReadRawData (error=%p,offset=%" PRIu64 ",buf=%p,size=%" PRId64 ") => "
                      "(%p)", error.get(), offset, buf, size, ok);
     return ok ? size : 0;
 }
@@ -497,7 +497,7 @@ SBData::SetData (lldb::SBError& error,
     else
         m_opaque_sp->SetData(buf, size, endian);
     if (log)
-        log->Printf ("SBData::SetData (error=%p,buf=%p,size=%zu,endian=%d,addr_size=%c) => "
+        log->Printf("SBData::SetData (error=%p,buf=%p,size=%" PRId64 ",endian=%d,addr_size=%c) => "
                      "(%p)", error.get(), buf, size, endian, addr_size, m_opaque_sp.get());
 }
 
@@ -647,7 +647,7 @@ SBData::SetDataFromUInt64Array (uint64_t* array, size_t array_len)
     if (!array || array_len == 0)
     {
         if (log)
-            log->Printf ("SBData::SetDataFromUInt64Array (array=%p, array_len = %zu) => "
+            log->Printf("SBData::SetDataFromUInt64Array (array=%p, array_len = %" PRId64 ") => "
                          "false", array, array_len);
         return false;
     }
@@ -662,7 +662,7 @@ SBData::SetDataFromUInt64Array (uint64_t* array, size_t array_len)
         m_opaque_sp->SetData(buffer_sp);
     
     if (log)
-        log->Printf ("SBData::SetDataFromUInt64Array (array=%p, array_len = %zu) => "
+        log->Printf("SBData::SetDataFromUInt64Array (array=%p, array_len = %" PRId64 ") => "
                      "true", array, array_len);
     
     return true;
@@ -676,7 +676,7 @@ SBData::SetDataFromUInt32Array (uint32_t* array, size_t array_len)
     if (!array || array_len == 0)
     {
         if (log)
-            log->Printf ("SBData::SetDataFromUInt32Array (array=%p, array_len = %zu) => "
+            log->Printf("SBData::SetDataFromUInt32Array (array=%p, array_len = %" PRId64 ") => "
                          "false", array, array_len);
         return false;
     }
@@ -691,7 +691,7 @@ SBData::SetDataFromUInt32Array (uint32_t* array, size_t array_len)
         m_opaque_sp->SetData(buffer_sp);
     
     if (log)
-        log->Printf ("SBData::SetDataFromUInt32Array (array=%p, array_len = %zu) => "
+        log->Printf("SBData::SetDataFromUInt32Array (array=%p, array_len = %" PRId64 ") => "
                      "true", array, array_len);
     
     return true;
@@ -705,7 +705,7 @@ SBData::SetDataFromSInt64Array (int64_t* array, size_t array_len)
     if (!array || array_len == 0)
     {
         if (log)
-            log->Printf ("SBData::SetDataFromSInt64Array (array=%p, array_len = %zu) => "
+            log->Printf("SBData::SetDataFromSInt64Array (array=%p, array_len = %" PRId64 ") => "
                          "false", array, array_len);
         return false;
     }
@@ -720,7 +720,7 @@ SBData::SetDataFromSInt64Array (int64_t* array, size_t array_len)
         m_opaque_sp->SetData(buffer_sp);
     
     if (log)
-        log->Printf ("SBData::SetDataFromSInt64Array (array=%p, array_len = %zu) => "
+        log->Printf("SBData::SetDataFromSInt64Array (array=%p, array_len = %" PRId64 ") => "
                      "true", array, array_len);
     
     return true;
@@ -734,7 +734,7 @@ SBData::SetDataFromSInt32Array (int32_t* array, size_t array_len)
     if (!array || array_len == 0)
     {
         if (log)
-            log->Printf ("SBData::SetDataFromSInt32Array (array=%p, array_len = %zu) => "
+            log->Printf("SBData::SetDataFromSInt32Array (array=%p, array_len = %" PRId64 ") => "
                          "false", array, array_len);
         return false;
     }
@@ -749,7 +749,7 @@ SBData::SetDataFromSInt32Array (int32_t* array, size_t array_len)
         m_opaque_sp->SetData(buffer_sp);
     
     if (log)
-        log->Printf ("SBData::SetDataFromSInt32Array (array=%p, array_len = %zu) => "
+        log->Printf("SBData::SetDataFromSInt32Array (array=%p, array_len = %" PRId64 ") => "
                      "true", array, array_len);
     
     return true;
@@ -763,7 +763,7 @@ SBData::SetDataFromDoubleArray (double* array, size_t array_len)
     if (!array || array_len == 0)
     {
         if (log)
-            log->Printf ("SBData::SetDataFromDoubleArray (array=%p, array_len = %zu) => "
+            log->Printf("SBData::SetDataFromDoubleArray (array=%p, array_len = %" PRId64 ") => "
                          "false", array, array_len);
         return false;
     }
@@ -778,7 +778,7 @@ SBData::SetDataFromDoubleArray (double* array, size_t array_len)
         m_opaque_sp->SetData(buffer_sp);
     
     if (log)
-        log->Printf ("SBData::SetDataFromDoubleArray (array=%p, array_len = %zu) => "
+        log->Printf("SBData::SetDataFromDoubleArray (array=%p, array_len = %" PRId64 ") => "
                      "true", array, array_len);
     
     return true;
diff --git a/lldb/source/API/SBHostOS.cpp b/lldb/source/API/SBHostOS.cpp
index 166403103ad..5f9ba625db1 100644
--- a/lldb/source/API/SBHostOS.cpp
+++ b/lldb/source/API/SBHostOS.cpp
@@ -42,7 +42,7 @@ lldb::thread_t
 SBHostOS::ThreadCreate
 (
     const char *name,
-    thread_func_t thread_function,
+    lldb::thread_func_t thread_function,
     void *thread_arg,
     SBError *error_ptr
 )
@@ -77,7 +77,7 @@ SBHostOS::ThreadDetach (lldb::thread_t thread, SBError *error_ptr)
 }
 
 bool
-SBHostOS::ThreadJoin (lldb::thread_t thread, thread_result_t *result, SBError *error_ptr)
+SBHostOS::ThreadJoin (lldb::thread_t thread, lldb::thread_result_t *result, SBError *error_ptr)
 {
     return Host::ThreadJoin (thread, result, error_ptr ? error_ptr->get() : NULL);
 }
diff --git a/lldb/source/API/SBProcess.cpp b/lldb/source/API/SBProcess.cpp
index 235388b5f25..4eeb48f3c25 100644
--- a/lldb/source/API/SBProcess.cpp
+++ b/lldb/source/API/SBProcess.cpp
@@ -338,7 +338,7 @@ SBProcess::PutSTDIN (const char *src, size_t src_len)
     }
     
     if (log)
-        log->Printf ("SBProcess(%p)::PutSTDIN (src=\"%s\", src_len=%d) => %zu", 
+        log->Printf("SBProcess(%p)::PutSTDIN (src=\"%s\", src_len=%d) => %" PRId64,
                      process_sp.get(), 
                      src, 
                      (uint32_t) src_len,