summaryrefslogtreecommitdiff
path: root/rts/Task.c
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2012-04-26 16:52:44 +0100
committerIan Lynagh <igloo@earth.li>2012-04-26 16:52:44 +0100
commit1dbe6d59b621ab9bd836241d633b3a8d99812cb3 (patch)
tree6482c2019a3a85f93c9b38c0e985d77f24388692 /rts/Task.c
parent3e314cc2060734ade9b82d4da418c119b3a05b4c (diff)
downloadhaskell-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/Task.c')
-rw-r--r--rts/Task.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/rts/Task.c b/rts/Task.c
index f4a37bf6ff..125000b914 100644
--- a/rts/Task.c
+++ b/rts/Task.c
@@ -320,7 +320,7 @@ discardTasksExcept (Task *keep)
for (task = all_tasks; task != NULL; task=next) {
next = task->all_next;
if (task != keep) {
- debugTrace(DEBUG_sched, "discarding task %ld", (long)TASK_ID(task));
+ debugTrace(DEBUG_sched, "discarding task %" FMT_SizeT "", (size_t)TASK_ID(task));
freeTask(task);
}
}
@@ -393,7 +393,7 @@ workerTaskStop (Task *task)
static void *taskId(Task *task)
{
#ifdef THREADED_RTS
- return (void *)task->id;
+ return (void *)(size_t)task->id;
#else
return (void *)task;
#endif