[commit: ghc] master: rts/RtsSymbols.c: Fix Windows build (898f34c)

git at git.haskell.org git at git.haskell.org
Sun Oct 25 10:25:28 UTC 2015


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/898f34cdd0121d6bc145f75af2cf99f58542b558/ghc

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

commit 898f34cdd0121d6bc145f75af2cf99f58542b558
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Sun Oct 25 11:43:17 2015 +1100

    rts/RtsSymbols.c: Fix Windows build
    
    Test Plan:
     - Build whole of GHC on Linux.
     - Cross-compile rts/RtsSymbols.c and rts/Linker.c to Windows using the
       i686-w64-mingw32-gcc and x86_64-w64-mingw32-gcc cross compilers.
    
    Reviewers: bgamari, awson, austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1365


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

898f34cdd0121d6bc145f75af2cf99f58542b558
 rts/RtsSymbols.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/rts/RtsSymbols.c b/rts/RtsSymbols.c
index 8c062bb..b9b0d2c 100644
--- a/rts/RtsSymbols.c
+++ b/rts/RtsSymbols.c
@@ -6,6 +6,7 @@
  *
  * ---------------------------------------------------------------------------*/
 
+#include "ghcplatform.h"
 #include "RtsSymbols.h"
 
 #include "Rts.h"
@@ -17,6 +18,13 @@
 #include "posix/Signals.h"
 #endif
 
+#if defined(mingw32_HOST_OS)
+#include <sys/stat.h>
+#include <io.h>
+#include <windows.h>
+#include <shfolder.h> /* SHGetFolderPathW */
+#endif
+
 /* -----------------------------------------------------------------------------
  * Symbols to be inserted into the RTS symbol table.
  */



More information about the ghc-commits mailing list