From 1dbe6d59b621ab9bd836241d633b3a8d99812cb3 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Thu, 26 Apr 2012 16:52:44 +0100 Subject: Fix warnings on Win64 Mostly this meant getting pointer<->int conversions to use the right sizes. lnat is now size_t, rather than unsigned long, as that seems a better match for how it's used. --- rts/Capability.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'rts/Capability.c') diff --git a/rts/Capability.c b/rts/Capability.c index 7b1a110b2f..b3b7629e54 100644 --- a/rts/Capability.c +++ b/rts/Capability.c @@ -419,7 +419,7 @@ giveCapabilityToTask (Capability *cap USED_IF_DEBUG, Task *task) ASSERT(task->cap == cap); debugTrace(DEBUG_sched, "passing capability %d to %s %p", cap->no, task->incall->tso ? "bound task" : "worker", - (void *)task->id); + (void *)(size_t)task->id); ACQUIRE_LOCK(&task->lock); if (task->wakeup == rtsFalse) { task->wakeup = rtsTrue; @@ -887,7 +887,7 @@ shutdownCapability (Capability *cap USED_IF_THREADS, for (t = cap->spare_workers; t != NULL; t = t->next) { if (!osThreadIsAlive(t->id)) { debugTrace(DEBUG_sched, - "worker thread %p has died unexpectedly", (void *)t->id); + "worker thread %p has died unexpectedly", (void *)(size_t)t->id); cap->n_spare_workers--; if (!prev) { cap->spare_workers = t->next; -- cgit v1.2.1