auto merge of #7054 : yichoi/rust/after_jemalloc, r=brson

bors · bors · commit 6bdd4c854575 · 2013-06-10T23:28:34.000-07:00
jemalloc searches pthread_atfork
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -76,4 +76,11 @@ extern "C" void globfree(glob_t *pglob)`
`76`	`76`	`{`
`77`	`77`	`}`
`78`	`78`
	`79`	`+extern "C" int pthread_atfork(void (*prefork)(void),`
	`80`	`+ void (*postfork_parent)(void),`
	`81`	`+ void (*postfork_child)(void))`
	`82`	`+{`
	`83`	`+ return 0;`
	`84`	`+}`
	`85`	`+`
`79`	`86`	`#endif`