projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Slightly better tracing in the constraint solver
[ghc-hetmet.git]
/
rts
/
RtsDllMain.c
diff --git
a/rts/RtsDllMain.c
b/rts/RtsDllMain.c
index
af3c509
..
2081e62
100644
(file)
--- a/
rts/RtsDllMain.c
+++ b/
rts/RtsDllMain.c
@@
-9,19
+9,19
@@
#include "PosixSource.h"
#include "Rts.h"
#include "RtsAPI.h"
#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. */
#ifdef HAVE_WINDOWS_H
#include <windows.h>
#endif
/* I'd be mildly surprised if this wasn't defined, but still. */
-#ifdef ENABLE_WIN32_DLL_SUPPORT
-
+#if defined(__PIC__) && defined(mingw32_HOST_OS)
BOOL
WINAPI
BOOL
WINAPI
-DllMain ( HINSTANCE hInstance
+DllMain ( HINSTANCE hInstance STG_UNUSED
, DWORD reason
, DWORD reason
- , LPVOID reserved
+ , LPVOID reserved STG_UNUSED
)
{
/*
)
{
/*
@@
-31,9
+31,13
@@
DllMain ( HINSTANCE hInstance
* you pass to the RTS.
*/
switch (reason) {
* 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;
}
}
return TRUE;
}
-#endif /* ENABLE_WIN32_DLL_SUPPORT */
+#endif /* defined(__PIC__) && defined(mingw32_HOST_OS) */