X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Fdriver.c;h=a6d2bd117b1f75181421b9e0b65ddb23265e5fd7;hb=0faf5367390e7d9323775ee8ef1f202533c3928c;hp=9181e53b25257183de08774b3a793327ebe33be2;hpb=00bf8defb4a2c6b678d34d32bec010743df4f8c3;p=mono.git

diff --git a/mono/mini/driver.c b/mono/mini/driver.c
index 9181e53b252..a6d2bd117b1 100644
--- a/mono/mini/driver.c
+++ b/mono/mini/driver.c
@@ -52,6 +52,7 @@
 #include "mono/utils/mono-counters.h"
 #include "mono/utils/mono-hwcap.h"
 #include "mono/utils/mono-logger-internals.h"
+#include "mono/utils/w32handle.h"
 
 #include "mini.h"
 #include "jit.h"
@@ -1367,30 +1368,6 @@ static const char info[] =
 #define error_if_aot_unsupported()
 #endif
 
-#ifdef HOST_WIN32
-BOOL APIENTRY DllMain (HMODULE module_handle, DWORD reason, LPVOID reserved)
-{
-	if (!mono_gc_dllmain (module_handle, reason, reserved))
-		return FALSE;
-
-	switch (reason)
-	{
-	case DLL_PROCESS_ATTACH:
-		mono_install_runtime_load (mini_init);
-		break;
-	case DLL_PROCESS_DETACH:
-		if (coree_module_handle)
-			FreeLibrary (coree_module_handle);
-		break;
-	case DLL_THREAD_DETACH:
-		mono_thread_info_detach ();
-		break;
-	
-	}
-	return TRUE;
-}
-#endif
-
 static gboolean enable_debugging;
 
 /*
@@ -1771,6 +1748,7 @@ mono_main (int argc, char* argv[])
 		} else if (strcmp (argv [i], "--llvmonly") == 0) {
 			mono_aot_only = TRUE;
 			mono_llvm_only = TRUE;
+		} else if (strcmp (argv [i], "--hybrid-aot") == 0) {
 		} else if (strcmp (argv [i], "--print-vtable") == 0) {
 			mono_print_vtable = TRUE;
 		} else if (strcmp (argv [i], "--stats") == 0) {
@@ -1986,6 +1964,10 @@ mono_main (int argc, char* argv[])
 
 	mono_counters_init ();
 
+#ifndef HOST_WIN32
+	mono_w32handle_init ();
+#endif
+
 	/* Set rootdir before loading config */
 	mono_set_rootdir ();