Merge pull request #2444 from xmcclure/randfixes

[mono.git] / mono / metadata / runtime.c

diff --git a/mono/metadata/runtime.c b/mono/metadata/runtime.c
index 2b8118f693749bca3761ca69a0090fe88ddf18c3..7e001b9984945bc85930752e9e7ba9da436d58c7 100644 (file)
--- a/mono/metadata/runtime.c
+++ b/mono/metadata/runtime.c
@@ -17,7 +17,7 @@
 #include <mono/metadata/runtime.h>
 #include <mono/metadata/monitor.h>
 #include <mono/metadata/threads-types.h>
-#include <mono/metadata/threadpool.h>
+#include <mono/metadata/threadpool-ms.h>
 #include <mono/metadata/marshal.h>
 #include <mono/utils/atomic.h>
 
@@ -104,7 +104,7 @@ mono_runtime_try_shutdown (void)
        mono_runtime_set_shutting_down ();
 
        /* This will kill the tp threads which cannot be suspended */
-       mono_thread_pool_cleanup ();
+       mono_threadpool_ms_cleanup ();
 
        /*TODO move the follow to here:
        mono_thread_suspend_all_other_threads (); OR  mono_thread_wait_all_other_threads
@@ -132,6 +132,5 @@ void
 mono_runtime_init_tls (void)
 {
        mono_marshal_init_tls ();
-       mono_thread_pool_init_tls ();
        mono_thread_init_tls ();
 }