about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-06-10 23:28:34 -0700
committerbors <bors@rust-lang.org>2013-06-10 23:28:34 -0700
commit6bdd4c854575a6f92501f060e67c60bebea14e03 (patch)
treeebe3289cbab4316b7c33ee619ec3aa2c86e9d51d
parentdf5b0c040c744879705b4c37be3bb1cbe7282ab2 (diff)
parentfebba9f41803e5a782c912131a9e26193ef0ced8 (diff)
downloadrust-6bdd4c854575a6f92501f060e67c60bebea14e03.tar.gz
rust-6bdd4c854575a6f92501f060e67c60bebea14e03.zip
auto merge of #7054 : yichoi/rust/after_jemalloc, r=brson
jemalloc searches pthread_atfork
-rw-r--r--src/rt/rust_android_dummy.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/rt/rust_android_dummy.cpp b/src/rt/rust_android_dummy.cpp
index b6fe78288e9..437893594a5 100644
--- a/src/rt/rust_android_dummy.cpp
+++ b/src/rt/rust_android_dummy.cpp
@@ -76,4 +76,11 @@ extern "C" void globfree(glob_t *pglob)
 {
 }
 
+extern "C" int pthread_atfork(void (*prefork)(void),
+                              void (*postfork_parent)(void),
+                              void (*postfork_child)(void))
+{
+    return 0;
+}
+
 #endif