]> granicus.if.org Git - gc/commitdiff
Merge remote-tracking branch 'robovm/thread_get_state_stack_corruption_on_ios7_64bit_...
authorIvan Maidanski <ivmai@mail.ru>
Tue, 4 Nov 2014 08:14:24 +0000 (11:14 +0300)
committerIvan Maidanski <ivmai@mail.ru>
Tue, 4 Nov 2014 08:14:24 +0000 (11:14 +0300)
Conflicts:
darwin_stop_world.c

1  2 
darwin_stop_world.c

index a8c5e959e66b03276e428a3536d3e559da46e519,690f0ea553125628150375f98043cd11440b3397..5754899033a6d3e4dec6c20e72b8d109bd867e65
  
  #if defined(GC_DARWIN_THREADS)
  
 +#include <sys/sysctl.h>
 +#include <mach/machine.h>
++#include <CoreFoundation/CoreFoundation.h>
 +
  /* From "Inside Mac OS X - Mach-O Runtime Architecture" published by Apple
     Page 49:
     "The space beneath the stack pointer, where a new stack frame would normally