X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fposix%2FGetTime.c;h=939eef177e0c26956843a1a7ccd70073ccc041d2;hb=661c97c65e5fa47177502e592bb763f752b487ac;hp=626882b205a3baeb6bb93a2fea33fbc41aeb7b85;hpb=a89ac49312ff740591226f0a6fd9322f15289c62;p=ghc-hetmet.git

diff --git a/rts/posix/GetTime.c b/rts/posix/GetTime.c
index 626882b..939eef1 100644
--- a/rts/posix/GetTime.c
+++ b/rts/posix/GetTime.c
@@ -134,7 +134,7 @@ Ticks getThreadCPUTime(void)
     }
     return ((usec * TICKS_PER_SECOND) / 1000000);
 
-#elif defined(HAVE_CLOCK_GETTIME) && defined (_POSIX_THREAD_CPUTIME) && defined(CLOCK_THREAD_CPUTIME_ID) && defined(HAVE_SYSCONF)
+#elif !defined(BE_CONSERVATIVE) && defined(HAVE_CLOCK_GETTIME) && defined (_POSIX_THREAD_CPUTIME) && defined(CLOCK_THREAD_CPUTIME_ID) && defined(HAVE_SYSCONF)
     if (sysconf(_POSIX_THREAD_CPUTIME) != -1) {
         // clock_gettime() gives us per-thread CPU time.  It isn't
         // reliable on Linux, but it's the best we have.
@@ -153,7 +153,7 @@ Ticks getThreadCPUTime(void)
 nat
 getPageFaults(void)
 {
-#if !defined(HAVE_GETRUSAGE) || irix_HOST_OS
+#if !defined(HAVE_GETRUSAGE) || irix_HOST_OS || haiku_HOST_OS
     return 0;
 #else
     struct rusage t;