merge upstream HEAD

[ghc-hetmet.git] / rts / RtsDllMain.c

diff --git a/rts/RtsDllMain.c b/rts/RtsDllMain.c
index 3e5af68..2081e62 100644 (file)
--- 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 <windows.h>
 #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
        )
 {
   /*
@@ -39,4 +40,4 @@ DllMain ( HINSTANCE hInstance
   return TRUE;
 }
 
-#endif /* defined(__PIC__) && defined(mingw32_TARGET_OS) */
+#endif /* defined(__PIC__) && defined(mingw32_HOST_OS) */