about summary refs log tree commit diff
path: root/src/rt/rust.cpp
diff options
context:
space:
mode:
authorNiko Matsakis <niko@alum.mit.edu>2011-10-05 15:25:50 -0700
committerBrian Anderson <banderson@mozilla.com>2011-10-05 16:10:36 -0700
commit61c9c46d944beeefb3fa2a6ca5501dbad8590537 (patch)
tree44ca91ff1fb850b8eea44ebff49b84974fee198a /src/rt/rust.cpp
parent100e0264b2a2e4e7d8f27b4ed25af8cb7b4a8c3c (diff)
downloadrust-61c9c46d944beeefb3fa2a6ca5501dbad8590537.tar.gz
rust-61c9c46d944beeefb3fa2a6ca5501dbad8590537.zip
remove pthread_exit() from rust_start()
It was causing OS X Lion to hang and (according to Apple) is undefined
in any case
Diffstat (limited to 'src/rt/rust.cpp')
-rw-r--r--src/rt/rust.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/rt/rust.cpp b/src/rt/rust.cpp
index 6d9243b8558..122c7b306bf 100644
--- a/src/rt/rust.cpp
+++ b/src/rt/rust.cpp
@@ -109,12 +109,6 @@ rust_start(uintptr_t main_fn, int argc, char **argv,
 
     free_env(env);
 
-#if !defined(__WIN32__)
-    // Don't take down the process if the main thread exits without an
-    // error.
-    if (!ret)
-        pthread_exit(NULL);
-#endif
     return ret;
 }