about summary refs log tree commit diff
path: root/src/libstd/sys/unix/stack_overflow.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-09-03 20:10:42 +0000
committerbors <bors@rust-lang.org>2015-09-03 20:10:42 +0000
commit1b908be9a0d7aaf8f18854db1ffef7b8df10dfeb (patch)
tree506e5b6cd2f56abd94c525bfbb34240e1466ed47 /src/libstd/sys/unix/stack_overflow.rs
parent0762f58c1143b4ff0ae5d0cdda9cdd8249512e77 (diff)
parente6e175b828a86defa5637cdc5980ba94fbddf449 (diff)
downloadrust-1b908be9a0d7aaf8f18854db1ffef7b8df10dfeb.tar.gz
rust-1b908be9a0d7aaf8f18854db1ffef7b8df10dfeb.zip
Auto merge of #28200 - Manishearth:rollup, r=Manishearth
- Successful merges: #28164, #28170, #28184, #28186, #28187, #28188, #28191, #28193, #28194, #28195
- Failed merges: 
Diffstat (limited to 'src/libstd/sys/unix/stack_overflow.rs')
-rw-r--r--src/libstd/sys/unix/stack_overflow.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/sys/unix/stack_overflow.rs b/src/libstd/sys/unix/stack_overflow.rs
index 1aa75fa18b7..de9e8cf97e6 100644
--- a/src/libstd/sys/unix/stack_overflow.rs
+++ b/src/libstd/sys/unix/stack_overflow.rs
@@ -93,7 +93,7 @@ mod imp {
         // See comment above for why this function returns.
     }
 
-    static mut MAIN_ALTSTACK: *mut libc::c_void = 0 as *mut libc::c_void;
+    static mut MAIN_ALTSTACK: *mut libc::c_void = ptr::null_mut();
 
     pub unsafe fn init() {
         PAGE_SIZE = ::sys::os::page_size();
@@ -146,7 +146,7 @@ mod imp {
               target_os = "netbsd",
               target_os = "openbsd")))]
 mod imp {
-    use libc;
+    use ptr;
 
     pub unsafe fn init() {
     }
@@ -155,7 +155,7 @@ mod imp {
     }
 
     pub unsafe fn make_handler() -> super::Handler {
-        super::Handler { _data: 0 as *mut libc::c_void }
+        super::Handler { _data: ptr::null_mut() }
     }
 
     pub unsafe fn drop_handler(_handler: &mut super::Handler) {