diff options
| author | Ian Lynagh <igloo@earth.li> | 2012-03-18 16:30:25 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2012-03-18 16:30:25 +0000 |
| commit | d879a5a8517b511733406049d46d6df5af20a15b (patch) | |
| tree | d0600a6f67b06ecf05d48b60e07ef7af5ec6775d /rts/StgCRun.c | |
| parent | 45740c29b24ea78b885d3b9f737a8bdc00265f7c (diff) | |
| download | haskell-d879a5a8517b511733406049d46d6df5af20a15b.tar.gz | |
Fixes for the threaded RTS on Win64
Diffstat (limited to 'rts/StgCRun.c')
| -rw-r--r-- | rts/StgCRun.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/rts/StgCRun.c b/rts/StgCRun.c index 3654b3336a..f08e35dd11 100644 --- a/rts/StgCRun.c +++ b/rts/StgCRun.c @@ -33,6 +33,14 @@ /* include Stg.h first because we want real machine regs in here: we * have to get the value of R1 back from Stg land to C land intact. */ + +/* We include windows.h very early, as on Win64 the CONTEXT type has + fields "R8", "R9" and "R10", which goes bad if we've already + #define'd those names for our own purposes (in stg/Regs.h) */ +#if defined(HAVE_WINDOWS_H) +#include <windows.h> +#endif + #define IN_STGCRUN 1 #include "Stg.h" #include "Rts.h" |