Merge pull request #637 from LogosBible/enetdown

[mono.git] / mono / mini / mini-darwin.c

diff --git a/mono/mini/mini-darwin.c b/mono/mini/mini-darwin.c
index 9f4f5a0e202afeb7525319810d0cf59c02808940..5ec06d20a748c8036e64b9900bbc623f3a47b723 100644 (file)
--- a/mono/mini/mini-darwin.c
+++ b/mono/mini/mini-darwin.c
@@ -68,9 +68,8 @@
 #include <pthread.h>
 #include <dlfcn.h>
 #include <AvailabilityMacros.h>
-#include <TargetConditionals.h>
 
-#if (MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_5) && TARGET_OS_IPHONE == 0 && TARGET_IPHONE_SIMULATOR == 0
+#if defined (TARGET_OSX) && (MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_5)
 #define NEEDS_EXCEPTION_THREAD
 #endif
 
@@ -308,7 +307,7 @@ mono_thread_state_init_from_handle (MonoThreadUnwindState *tctx, MonoNativeThrea
 
        mono_sigctx_to_monoctx (&ctx, &tctx->ctx);
 
-       domain_key = mono_domain_get_tls_offset ();
+       domain_key = mono_domain_get_tls_key ();
        jit_key = mono_get_jit_tls_key ();
 
        jit_tls = mono_mach_arch_get_tls_value_from_thread (thread_id, jit_key);