about summary refs log tree commit diff
path: root/src/libstd/sys/windows
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-07-21 20:51:04 +0000
committerbors <bors@rust-lang.org>2015-07-21 20:51:04 +0000
commitee2d3bc8a20545aa6bb660ae0e30ff143f160d16 (patch)
tree11f8943dddf55f253b0247d09d8447826d083595 /src/libstd/sys/windows
parent21dfd24c4b1f8c24abb78d573c42344b8d2ec809 (diff)
parentd68b152c3e2feb6ee18bdf2c992098376dbb528c (diff)
downloadrust-ee2d3bc8a20545aa6bb660ae0e30ff143f160d16.tar.gz
rust-ee2d3bc8a20545aa6bb660ae0e30ff143f160d16.zip
Auto merge of #27073 - alexcrichton:less-proc-fs, r=brson
This can fail on linux for various reasons, such as the /proc filesystem not
being mounted. There are already many cases where we can't set up stack guards,
so just don't worry about this case and communicate that no guard was enabled.

I've confirmed that this allows the compiler to run in a chroot without /proc
mounted.

Closes #22642
Diffstat (limited to 'src/libstd/sys/windows')
-rw-r--r--src/libstd/sys/windows/thread.rs7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/libstd/sys/windows/thread.rs b/src/libstd/sys/windows/thread.rs
index 50dfee4ab10..42805c2ac52 100644
--- a/src/libstd/sys/windows/thread.rs
+++ b/src/libstd/sys/windows/thread.rs
@@ -86,7 +86,8 @@ impl Thread {
 }
 
 pub mod guard {
-    pub unsafe fn main() -> usize { 0 }
-    pub unsafe fn current() -> usize { 0 }
-    pub unsafe fn init() {}
+    use prelude::v1::*;
+
+    pub unsafe fn current() -> Option<usize> { None }
+    pub unsafe fn init() -> Option<usize> { None }
 }