projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Put "dl" back in rts/package.conf if HAVE_DL is defined
[ghc-hetmet.git]
/
rts
/
win32
/
ThrIOManager.c
diff --git
a/rts/win32/ThrIOManager.c
b/rts/win32/ThrIOManager.c
index
a74aac1
..
e62b33d
100644
(file)
--- a/
rts/win32/ThrIOManager.c
+++ b/
rts/win32/ThrIOManager.c
@@
-8,7
+8,7
@@
* ---------------------------------------------------------------------------*/
\r
\r
#include "Rts.h"
\r
* ---------------------------------------------------------------------------*/
\r
\r
#include "Rts.h"
\r
-#include "ThrIOManager.h"
\r
+#include "IOManager.h"
\r
#include "Prelude.h"
\r
#include <windows.h>
\r
\r
#include "Prelude.h"
\r
#include <windows.h>
\r
\r
@@
-34,7
+34,7
@@
getIOManagerEvent (void)
hRes = CreateEvent ( NULL, // no security attrs
\r
TRUE, // manual reset
\r
FALSE, // initial state,
\r
hRes = CreateEvent ( NULL, // no security attrs
\r
TRUE, // manual reset
\r
FALSE, // initial state,
\r
- "IO Manager Event" );
\r
+ NULL ); // event name: NULL for private events
\r
if (hRes == NULL) {
\r
sysErrorBelch("getIOManagerEvent");
\r
stg_exit(EXIT_FAILURE);
\r
if (hRes == NULL) {
\r
sysErrorBelch("getIOManagerEvent");
\r
stg_exit(EXIT_FAILURE);
\r
@@
-137,7
+137,11
@@
ioManagerStart (void)
Capability *cap;
\r
if (io_manager_event == INVALID_HANDLE_VALUE) {
\r
cap = rts_lock();
\r
Capability *cap;
\r
if (io_manager_event == INVALID_HANDLE_VALUE) {
\r
cap = rts_lock();
\r
+#if defined(mingw32_HOST_OS) && defined(__PIC__)
\r
+ rts_evalIO(cap,_imp__base_GHCziConc_ensureIOManagerIsRunning_closure,NULL);
\r
+#else
\r
rts_evalIO(cap,&base_GHCziConc_ensureIOManagerIsRunning_closure,NULL);
\r
rts_evalIO(cap,&base_GHCziConc_ensureIOManagerIsRunning_closure,NULL);
\r
+#endif
\r
rts_unlock(cap);
\r
}
\r
}
\r
rts_unlock(cap);
\r
}
\r
}
\r