about summary refs log tree commit diff
path: root/src/rt/rust_task.cpp
diff options
context:
space:
mode:
authorILyoan <ilyoan@gmail.com>2012-11-29 19:36:03 +0900
committerBrian Anderson <banderson@mozilla.com>2013-01-13 16:43:39 -0800
commit4fb4be8f174c9d19c8ec6702070ef55987f73cb3 (patch)
tree1cab16b580d3776e4b5da77c62501427e1b3b23b /src/rt/rust_task.cpp
parent987f824f233faee4aed39dac92a1b442d42965cc (diff)
downloadrust-4fb4be8f174c9d19c8ec6702070ef55987f73cb3.tar.gz
rust-4fb4be8f174c9d19c8ec6702070ef55987f73cb3.zip
More android support
Conflicts:
	Makefile.in
	cmakeFiles/rustllvm.cmake
Diffstat (limited to 'src/rt/rust_task.cpp')
-rw-r--r--src/rt/rust_task.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/rt/rust_task.cpp b/src/rt/rust_task.cpp
index 9dd7c62f867..059085865d9 100644
--- a/src/rt/rust_task.cpp
+++ b/src/rt/rust_task.cpp
@@ -9,9 +9,13 @@
 // except according to those terms.
 
 
-#ifndef __WIN32__
+#ifndef __WIN32_
+#ifdef __ANDROID__
+#include "rust_android_dummy.h"
+#else
 #include <execinfo.h>
 #endif
+#endif
 #include <iostream>
 #include <algorithm>