diff options
author | Ian Lynagh <igloo@earth.li> | 2012-04-26 16:52:44 +0100 |
---|---|---|
committer | Ian Lynagh <igloo@earth.li> | 2012-04-26 16:52:44 +0100 |
commit | 1dbe6d59b621ab9bd836241d633b3a8d99812cb3 (patch) | |
tree | 6482c2019a3a85f93c9b38c0e985d77f24388692 /rts/Capability.c | |
parent | 3e314cc2060734ade9b82d4da418c119b3a05b4c (diff) | |
download | haskell-1dbe6d59b621ab9bd836241d633b3a8d99812cb3.tar.gz |
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.
Diffstat (limited to 'rts/Capability.c')
-rw-r--r-- | rts/Capability.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |