summaryrefslogtreecommitdiff
path: root/rts/posix
diff options
context:
space:
mode:
authorTamar Christina <tamar@zhox.com>2016-12-05 21:27:23 +0000
committerTamar Christina <tamar@zhox.com>2016-12-06 07:01:23 +0000
commitb82f71b96660400b4b9fa7f3ccef9df7532bb2d7 (patch)
treec9dce3ffb9744f9af91bf07288442040309d0b26 /rts/posix
parent847d229346431483b99adcff12e46c7bf6af15da (diff)
downloadhaskell-b82f71b96660400b4b9fa7f3ccef9df7532bb2d7.tar.gz
Fix x86 Windows build and testsuite
Summary: Fix issues preventing x86 GHC to build on Windows and fix segfault in the testsuite. Test Plan: ./validate Reviewers: austin, erikd, simonmar, bgamari Reviewed By: bgamari Subscribers: #ghc_windows_task_force, thomie Differential Revision: https://phabricator.haskell.org/D2789
Diffstat (limited to 'rts/posix')
-rw-r--r--rts/posix/OSMem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/rts/posix/OSMem.c b/rts/posix/OSMem.c
index beffedaac4..dcf734f19d 100644
--- a/rts/posix/OSMem.c
+++ b/rts/posix/OSMem.c
@@ -593,7 +593,7 @@ uint32_t osNumaNodes(void)
#endif
}
-StgWord osNumaMask(void)
+uint64_t osNumaMask(void)
{
#if HAVE_LIBNUMA
struct bitmask *mask;