Ticket #16290: patch-libgc-darwin_stop_world.c.diff

libgc/darwin_stop_world.c

@@ -105 +105 @@
         if(r != KERN_SUCCESS) ABORT("thread_get_state failed");
         
 #if defined(I386)
-#if defined(_STRUCT_X86_EXCEPTION_STATE32)
+#if __DARWIN_UNIX03
         lo = state.__esp;
 
         GC_push_one(state.__eax); 
@@ -127 +127 @@
         GC_push_one(state.ebp); 
 #endif
 #elif defined(POWERPC)
-#if defined(_STRUCT_PPC_EXCEPTION_STATE)
+#if __DARWIN_UNIX03
         lo = (void*)(state.__r1 - PPC_RED_ZONE_SIZE);
         
         GC_push_one(state.__r0); 
@@ -270 +270 @@
                              (natural_t *)&info, &outCount);
         if(r != KERN_SUCCESS) continue;
 
-#if defined(_STRUCT_PPC_EXCEPTION_STATE)
+#if __DARWIN_UNIX03
         lo = (void*)(info.__r1 - PPC_RED_ZONE_SIZE);
         hi = (ptr_t)FindTopOfStack(info.__r1);
 
@@ -350 +350 @@
                              (natural_t *)&info, &outCount);
         if(r != KERN_SUCCESS) continue;
 
-#if defined(_STRUCT_X86_EXCEPTION_STATE32)
+#if __DARWIN_UNIX03
         lo = (void*)info.__esp;
         hi = (ptr_t)FindTopOfStack(info.__esp);