projects
/
platform
/
upstream
/
libgc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8f6f158
f642b79
)
Merge remote-tracking branch 'robovm/thread_get_state_stack_corruption_on_ios7_64bit_...
author
Ivan Maidanski
<ivmai@mail.ru>
Tue, 4 Nov 2014 08:14:24 +0000
(11:14 +0300)
committer
Ivan 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
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
darwin_stop_world.c
index
a8c5e95
,
690f0ea
..
5754899
---
1
/
darwin_stop_world.c
---
2
/
darwin_stop_world.c
+++ b/
darwin_stop_world.c
@@@
-21,9
-25,6
+21,10
@@@
#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