2009-07-20 Geoff Norton <gnorton@novell.com>

        * darwin_stop_world.c: Fix the x86 version guards to use Apple's
        properly defined macros.

svn path=/trunk/mono/; revision=138477

diff --git a/ChangeLog b/ChangeLog
index f7e78a27d601b91703bbe002825c36933322204e..1d797571d534c8c0770e213571843b9f4e3fbd5b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-20  Geoff Norton  <gnorton@novell.com>
+
+       * darwin_stop_world.c: Fix the x86 version guards to use Apple's
+       properly defined macros.
+
 2009-07-02  jonas echterhoff <jonas@unity3d.com>
        
        * darwin_stop_world.c: make debugger code compile on 

diff --git a/darwin_stop_world.c b/darwin_stop_world.c
index f9ba57c02b6e8d000d458cc1c5e9c7664bc7d789..0c85c00572953ec063036bb3dbdcf0a641f3ad28 100644 (file)
--- a/darwin_stop_world.c
+++ b/darwin_stop_world.c
@@ -2,6 +2,7 @@
 
 # if defined(GC_DARWIN_THREADS)
 
+#include <AvailabilityMacros.h>
 #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);