[oslog-build-issues] Fixup tvos build issues.

Author: mwwa

stdlib/public/SDK/os/os_trace_blob.c

@@ -81,7 +81,7 @@ os_trace_blob_grow(os_trace_blob_t ob, size_t hint)
     } else if (os_mul_overflow(ob->ob_size, 2, &size)) {
         size = ob->ob_maxsize;
     } else {
-        size = MIN(ob->ob_maxsize, MAX(minsize, size));
+        size = MIN((uint32_t)ob->ob_maxsize, MAX(minsize, size));
     }
     if (size > ob->ob_size) {
         if (ob->ob_flags & OS_TRACE_BLOB_NEEDS_FREE) {

stdlib/public/SDK/os/os_trace_blob.h

@@ -13,6 +13,8 @@
 #ifndef __BLOB_H__
 #define __BLOB_H__
 
+#include <stdlib.h>
+#include <string.h>
 #include "thunks.h"
 
 OS_ENUM(os_trace_blob_flags, uint16_t,

stdlib/public/SDK/os/thunks.h

@@ -30,6 +30,10 @@
 #define MIN(a, b)  (((a)<(b))?(a):(b))
 #endif
 
+#ifndef MAX
+#define MAX(a, b)  (((a)>(b))?(a):(b))
+#endif
+
 #ifndef OS_TRACE_INTERNAL_CRASH
 #define OS_TRACE_INTERNAL_CRASH(_ptr, _message) _swift_os_log_reportError(0, _message)
 #endif