libdispatch: clean up some Win64 warnings

This cleans up the few warnings that remain when building libdispatch.
It now builds clean of warnings with clang 8.

Signed-off-by: Kim Topley <ktopley@apple.com>

Author: compnerd

src/init.c

@@ -1087,7 +1087,7 @@ _dispatch_logv_init(void *context DISPATCH_UNUSED)
 			char path[MAX_PATH + 1] = {0};
 			DWORD dwLength = GetTempPathA(MAX_PATH, path);
 			dispatch_assert(dwLength <= MAX_PATH + 1);
-			snprintf(&path[dwLength], MAX_PATH - dwLength, "libdispatch.%d.log",
+			snprintf(&path[dwLength], MAX_PATH - dwLength, "libdispatch.%lu.log",
 					GetCurrentProcessId());
 			dispatch_logfile = _open(path, O_WRONLY | O_APPEND | O_CREAT, 0666);
 #else

src/internal.h

@@ -289,6 +289,7 @@ upcast(dispatch_object_t dou)
 #include <sys/mman.h>
 #include <netinet/in.h>
 #endif
+#include <inttypes.h>
 
 #ifdef __BLOCKS__
 #if __has_include(<Block_private.h>)

src/io.c

@@ -2561,11 +2561,11 @@ static size_t
 _dispatch_io_debug_attr(dispatch_io_t channel, char* buf, size_t bufsiz)
 {
 	dispatch_queue_t target = channel->do_targetq;
-	return dsnprintf(buf, bufsiz, "type = %s, fd = 0x%x, %sfd_entry = %p, "
+	return dsnprintf(buf, bufsiz, "type = %s, fd = 0x%" PRIxPTR ", %sfd_entry = %p, "
 			"queue = %p, target = %s[%p], barrier_queue = %p, barrier_group = "
 			"%p, err = 0x%x, low = 0x%zx, high = 0x%zx, interval%s = %llu ",
 			channel->params.type == DISPATCH_IO_STREAM ? "stream" : "random",
-			channel->fd_actual, channel->atomic_flags & DIO_STOPPED ?
+			(intptr_t)channel->fd_actual, channel->atomic_flags & DIO_STOPPED ?
 			"stopped, " : channel->atomic_flags & DIO_CLOSED ? "closed, " : "",
 			channel->fd_entry, channel->queue, target && target->dq_label ?
 			target->dq_label : "", target, channel->barrier_queue,
@@ -2595,13 +2595,13 @@ _dispatch_operation_debug_attr(dispatch_operation_t op, char* buf,
 {
 	dispatch_queue_t target = op->do_targetq;
 	dispatch_queue_t oqtarget = op->op_q ? op->op_q->do_targetq : NULL;
-	return dsnprintf(buf, bufsiz, "type = %s %s, fd = 0x%x, fd_entry = %p, "
+	return dsnprintf(buf, bufsiz, "type = %s %s, fd = 0x%" PRIxPTR ", fd_entry = %p, "
 			"channel = %p, queue = %p -> %s[%p], target = %s[%p], "
 			"offset = %lld, length = %zu, done = %zu, undelivered = %zu, "
 			"flags = %u, err = 0x%x, low = 0x%zx, high = 0x%zx, "
 			"interval%s = %llu ", op->params.type == DISPATCH_IO_STREAM ?
 			"stream" : "random", op->direction == DOP_DIR_READ ? "read" :
-			"write", op->fd_entry ? op->fd_entry->fd : -1, op->fd_entry,
+			"write", (intptr_t)(op->fd_entry ? op->fd_entry->fd : -1), op->fd_entry,
 			op->channel, op->op_q, oqtarget && oqtarget->dq_label ?
 			oqtarget->dq_label : "", oqtarget, target && target->dq_label ?
 			target->dq_label : "", target, (long long)op->offset, op->length,

src/queue.c

@@ -7452,7 +7452,9 @@ _dispatch_sig_thread(void *ctxt DISPATCH_UNUSED)
 {
 	// never returns, so burn bridges behind us
 	_dispatch_clear_stack(0);
-#if !defined(_WIN32)
+#if defined(_WIN32)
+	for (;;) SuspendThread(GetCurrentThread());
+#else
 	_dispatch_sigsuspend();
 #endif
 }

src/semaphore.c

@@ -76,7 +76,7 @@ _dispatch_semaphore_debug(dispatch_object_t dou, char *buf, size_t bufsiz)
 			dsema->dsema_sema);
 #endif
 	offset += dsnprintf(&buf[offset], bufsiz - offset,
-			"value = %ld, orig = %ld }", dsema->dsema_value, dsema->dsema_orig);
+			"value = %" PRId64 ", orig = %" PRId64 " }", dsema->dsema_value, dsema->dsema_orig);
 	return offset;
 }
 
@@ -198,7 +198,7 @@ _dispatch_group_debug(dispatch_object_t dou, char *buf, size_t bufsiz)
 			_dispatch_object_class_name(dg), dg);
 	offset += _dispatch_object_debug_attr(dg, &buf[offset], bufsiz - offset);
 	offset += dsnprintf(&buf[offset], bufsiz - offset,
-			"count = %d, gen = %d, waiters = %d, notifs = %d }",
+			"count = %"PRIu32", gen = %"PRIu32", waiters = %d, notifs = %d }",
 			_dg_state_value(dg_state), _dg_state_gen(dg_state),
 			(bool)(dg_state & DISPATCH_GROUP_HAS_WAITERS),
 			(bool)(dg_state & DISPATCH_GROUP_HAS_NOTIFS));