diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2012-09-17 13:09:22 +0100 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2012-09-17 13:09:22 +0100 |
| commit | b0db9308017fc14b600b3a85d9c55a037f12ee9e (patch) | |
| tree | b51b0b9d26b328b5e14e9d4d681219483f9c9b1f /rts/win32/GetTime.c | |
| parent | 633dd5589f8625a8771ac75c5341ea225301d882 (diff) | |
| parent | 8c3b9aca3aaf946a91c9af6c07fc9d2afb6bbb76 (diff) | |
| download | haskell-b0db9308017fc14b600b3a85d9c55a037f12ee9e.tar.gz | |
Merge remote-tracking branch 'origin/master' into tc-untouchables
Conflicts:
compiler/typecheck/TcMType.lhs
compiler/typecheck/TcSMonad.lhs
Diffstat (limited to 'rts/win32/GetTime.c')
| -rw-r--r-- | rts/win32/GetTime.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rts/win32/GetTime.c b/rts/win32/GetTime.c index ec506fe4d0..bfab43a9cc 100644 --- a/rts/win32/GetTime.c +++ b/rts/win32/GetTime.c @@ -153,7 +153,7 @@ getUnixEpochTime(StgWord64 *sec, StgWord32 *nsec) *nsec = ((unsigned long)(unixtime.QuadPart % 10000000ull)) * 100ul; } -nat +W_ getPageFaults(void) { /* ToDo (on NT): better, get this via the performance data |