summaryrefslogtreecommitdiff
path: root/rts
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2012-07-15 12:58:10 +0100
committerIan Lynagh <igloo@earth.li>2012-07-15 12:58:10 +0100
commit28d13243252f8e8490fe0f3b92fa4a7a4ab917fe (patch)
tree03ee42500a46dfbd1300e35dd580946f3bc848de /rts
parentb15919dc365cb1f789f19d0198bb7c5ae5fb670c (diff)
downloadhaskell-28d13243252f8e8490fe0f3b92fa4a7a4ab917fe.tar.gz
Fix build on OS X
Diffstat (limited to 'rts')
-rw-r--r--rts/Trace.h4
-rw-r--r--rts/posix/OSThreads.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/rts/Trace.h b/rts/Trace.h
index 39102d31ad..b3710d32c9 100644
--- a/rts/Trace.h
+++ b/rts/Trace.h
@@ -654,8 +654,8 @@ INLINE_HEADER void traceEventGcStats(Capability *cap STG_UNUSED,
copied, slop, fragmentation,
par_n_threads, par_max_copied, par_tot_copied);
}
- dtraceEventGcStats(heap_capset, gens,
- copies, slop, fragmentation,
+ dtraceEventGcStats(heap_capset, gen,
+ copied, slop, fragmentation,
par_n_threads, par_max_copied, par_tot_copied);
}
diff --git a/rts/posix/OSThreads.c b/rts/posix/OSThreads.c
index bacae492bf..7fa2f4d75d 100644
--- a/rts/posix/OSThreads.c
+++ b/rts/posix/OSThreads.c
@@ -29,6 +29,10 @@
#include <sys/syscall.h>
#endif
+#if defined(HAVE_PTHREAD_H)
+#include <pthread.h>
+#endif
+
#if defined(THREADED_RTS)
#include "RtsUtils.h"
#include "Task.h"