about summary refs log tree commit diff
path: root/src/libstd/sys
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-01-25 17:23:54 +0000
committerbors <bors@rust-lang.org>2017-01-25 17:23:54 +0000
commitfc57e40ce703cb70a39249f5cfb661020a1549b6 (patch)
tree60c257c4000f019544f94929faf63a2fcc48e56b /src/libstd/sys
parent1283c029557bcde106adde71f467fe133b3ffeff (diff)
parenta2fa75b70546baa160be2a00326fa1b08d699b4c (diff)
downloadrust-fc57e40ce703cb70a39249f5cfb661020a1549b6.tar.gz
rust-fc57e40ce703cb70a39249f5cfb661020a1549b6.zip
Auto merge of #39296 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 6 pull requests

- Successful merges: #38930, #39212, #39251, #39267, #39276, #39278
- Failed merges:
Diffstat (limited to 'src/libstd/sys')
-rw-r--r--src/libstd/sys/redox/os.rs9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/libstd/sys/redox/os.rs b/src/libstd/sys/redox/os.rs
index 135e972bca4..9d459581dd4 100644
--- a/src/libstd/sys/redox/os.rs
+++ b/src/libstd/sys/redox/os.rs
@@ -33,9 +33,16 @@ use vec;
 const TMPBUF_SZ: usize = 128;
 static ENV_LOCK: Mutex = Mutex::new();
 
+extern {
+    #[link_name = "__errno_location"]
+    fn errno_location() -> *mut i32;
+}
+
 /// Returns the platform-specific value of errno
 pub fn errno() -> i32 {
-    0
+    unsafe {
+        (*errno_location())
+    }
 }
 
 /// Gets a detailed string description for the given error number.