about summary refs log tree commit diff
path: root/src/rt/rust_android_dummy.cpp
diff options
context:
space:
mode:
authorEric Reed <ereed@mozilla.com>2013-06-17 12:45:40 -0700
committerEric Reed <ereed@mozilla.com>2013-06-17 12:45:40 -0700
commit35f3fa6383b5ed278879bfe5c74a913b885a2d4f (patch)
treebe8ca61c0beccd0b4c5d1e486c5322c1181c49f5 /src/rt/rust_android_dummy.cpp
parent33ae193a3c1a156e73bf6880366c9785dd4b7393 (diff)
parent319cf6e465f203c794d71800808c2bd60a1e7613 (diff)
downloadrust-35f3fa6383b5ed278879bfe5c74a913b885a2d4f.tar.gz
rust-35f3fa6383b5ed278879bfe5c74a913b885a2d4f.zip
Merge remote-tracking branch 'upstream/io' into io
Conflicts:
	src/libstd/rt/uvio.rs
Diffstat (limited to 'src/rt/rust_android_dummy.cpp')
-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