[commit: ghc] master: Fix build errors on Windows (these tests still don't work though) (4b5d62a)

git at git.haskell.org git at git.haskell.org
Wed Nov 12 15:34:54 UTC 2014


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/4b5d62ab04103843ba07128d90499fbe103d773b/ghc

>---------------------------------------------------------------

commit 4b5d62ab04103843ba07128d90499fbe103d773b
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Wed Nov 5 18:05:10 2014 +0000

    Fix build errors on Windows (these tests still don't work though)


>---------------------------------------------------------------

4b5d62ab04103843ba07128d90499fbe103d773b
 testsuite/tests/rts/linker_error.c  | 3 +++
 testsuite/tests/rts/linker_unload.c | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/testsuite/tests/rts/linker_error.c b/testsuite/tests/rts/linker_error.c
index 60d24a5..715eabd 100644
--- a/testsuite/tests/rts/linker_error.c
+++ b/testsuite/tests/rts/linker_error.c
@@ -2,6 +2,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "Rts.h"
+#if defined(mingw32_HOST_OS)
+#include <malloc.h>
+#endif
 
 #define ITERATIONS 10
 
diff --git a/testsuite/tests/rts/linker_unload.c b/testsuite/tests/rts/linker_unload.c
index 4980eeb..8d1984f 100644
--- a/testsuite/tests/rts/linker_unload.c
+++ b/testsuite/tests/rts/linker_unload.c
@@ -2,6 +2,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "Rts.h"
+#if defined(mingw32_HOST_OS)
+#include <malloc.h>
+#endif
 
 #define ITERATIONS 10000
 



More information about the ghc-commits mailing list