From 552b5d59428c6842c5bdad7e75ebf22de53804f4 Mon Sep 17 00:00:00 2001 From: Geoff Norton Date: Thu, 23 Jul 2009 01:28:12 +0000 Subject: [PATCH] 2009-07-20 Geoff Norton * darwin_stop_world.c: Fix the x86 version guards to use Apple's properly defined macros. svn path=/trunk/mono/; revision=138477 --- ChangeLog | 5 +++++ darwin_stop_world.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f7e78a27..1d797571 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-07-20 Geoff Norton + + * darwin_stop_world.c: Fix the x86 version guards to use Apple's + properly defined macros. + 2009-07-02 jonas echterhoff * darwin_stop_world.c: make debugger code compile on diff --git a/darwin_stop_world.c b/darwin_stop_world.c index f9ba57c0..0c85c005 100644 --- a/darwin_stop_world.c +++ b/darwin_stop_world.c @@ -2,6 +2,7 @@ # if defined(GC_DARWIN_THREADS) +#include #include "mono/utils/mono-compiler.h" #ifdef MONO_DEBUGGER_SUPPORTED @@ -111,7 +112,8 @@ void GC_push_all_stacks() { if(r != KERN_SUCCESS) ABORT("thread_get_state failed"); #if defined(I386) -#if defined(_STRUCT_X86_EXCEPTION_STATE32) +#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 + lo = state.__esp; GC_push_one(state.__eax); @@ -356,7 +358,7 @@ void GC_push_all_stacks() { (natural_t *)&info, &outCount); if(r != KERN_SUCCESS) continue; -#if defined(_STRUCT_X86_EXCEPTION_STATE32) +#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 lo = (void*)info.__esp; hi = (ptr_t)FindTopOfStack(info.__esp); -- 2.40.0