X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rts%2FRtsDllMain.c;h=2081e621a921306e2b71c049d276c2a6a04ac528;hp=250b63ea68e52889baa9dc9e129421734defddc6;hb=e5c3b478b3cd1707cf122833822f44b2ac09b8e9;hpb=006a18ea83799c0d4255071a2f8c08d3e9c7d84f diff --git a/rts/RtsDllMain.c b/rts/RtsDllMain.c index 250b63e..2081e62 100644 --- a/rts/RtsDllMain.c +++ b/rts/RtsDllMain.c @@ -9,18 +9,19 @@ #include "PosixSource.h" #include "Rts.h" #include "RtsAPI.h" +#include "RtsDllMain.h" #ifdef HAVE_WINDOWS_H #include #endif /* I'd be mildly surprised if this wasn't defined, but still. */ -#if defined(__PIC__) && defined(mingw32_TARGET_OS) +#if defined(__PIC__) && defined(mingw32_HOST_OS) BOOL WINAPI -DllMain ( HINSTANCE hInstance +DllMain ( HINSTANCE hInstance STG_UNUSED , DWORD reason - , LPVOID reserved + , LPVOID reserved STG_UNUSED ) { /* @@ -30,9 +31,13 @@ DllMain ( HINSTANCE hInstance * you pass to the RTS. */ switch (reason) { - case DLL_PROCESS_DETACH: shutdownHaskell(); + + // shutdownHaskelAndExit() is already being called, + // so I don't think we need this. BL 2009/11/17 + + //case DLL_PROCESS_DETACH: shutdownHaskell(); } return TRUE; } -#endif /* defined(__PIC__) && defined(mingw32_TARGET_OS) */ +#endif /* defined(__PIC__) && defined(mingw32_HOST_OS) */