Remove the Windows Async IO Manager completely in THREADED_RTS mode

It isn't used here anyway, just making sure the code doesn't get compiled in.

diff --git a/rts/RtsStartup.c b/rts/RtsStartup.c
index c2f765a..dba529b 100644 (file)
--- a/rts/RtsStartup.c
+++ b/rts/RtsStartup.c
@@ -56,7 +56,7 @@
 # include "LLC.h"
 #endif
 
-#if defined(mingw32_HOST_OS)
+#if defined(mingw32_HOST_OS) && !defined(THREADED_RTS)
 #include "win32/AsyncIO.h"
 #endif
 
@@ -254,7 +254,7 @@ hs_init(int *argc, char **argv[])
     initDefaultHandlers();
 #endif
  
-#if defined(mingw32_HOST_OS)
+#if defined(mingw32_HOST_OS) && !defined(THREADED_RTS)
     startupAsyncIO();
 #endif
 
@@ -465,7 +465,7 @@ hs_exit(void)
     if (RtsFlags.TickyFlags.showTickyStats) PrintTickyInfo();
 #endif
 
-#if defined(mingw32_HOST_OS)
+#if defined(mingw32_HOST_OS) && !defined(THREADED_RTS)
     shutdownAsyncIO();
 #endif
 

diff --git a/rts/win32/AsyncIO.c b/rts/win32/AsyncIO.c
index d471ee8..cd0cf38 100644 (file)
--- a/rts/win32/AsyncIO.c
+++ b/rts/win32/AsyncIO.c
@@ -4,6 +4,9 @@
  *
  * (c) sof, 2002-2003.
  */
+
+#if !defined(THREADED_RTS)
+
 #include "Rts.h"
 #include "RtsUtils.h"
 #include <windows.h>
@@ -354,3 +357,4 @@ resetAbandonRequestWait( void )
     ResetEvent(abandon_req_wait);
 }
 
+#endif /* !defined(THREADED_RTS) */

diff --git a/rts/win32/IOManager.c b/rts/win32/IOManager.c
index 2123b8c..764be69 100644 (file)
--- a/rts/win32/IOManager.c
+++ b/rts/win32/IOManager.c
@@ -4,6 +4,9 @@
  *
  * (c) sof, 2002-2003.
  */
+
+#if !defined(THREADED_RTS)
+
 #include "Rts.h"
 #include "IOManager.h"
 #include "WorkQueue.h"
@@ -526,3 +529,5 @@ abandonWorkRequest ( int reqID )
      */
     LeaveCriticalSection(&ioMan->active_work_lock);
 }
+
+#endif