diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-01-21 09:18:07 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-01-21 09:18:07 -0800 |
| commit | 907db6c8344a4df070ee2b21479062a63c3ae2be (patch) | |
| tree | b4950d1359d2d30a866039946cf4ff96ba8d6019 /src/liballoc | |
| parent | b5de8333b3ef29fe3d0952d9207fd275c45da9f2 (diff) | |
| parent | 2c2480df5d340f4c7b2deeef0177e4fd22f2b03a (diff) | |
| download | rust-907db6c8344a4df070ee2b21479062a63c3ae2be.tar.gz rust-907db6c8344a4df070ee2b21479062a63c3ae2be.zip | |
rollup merge of #21444: petrochenkov/null
Conflicts: src/libstd/sync/mpsc/select.rs
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/heap.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liballoc/heap.rs b/src/liballoc/heap.rs index bd5b43b782e..44be0503bc2 100644 --- a/src/liballoc/heap.rs +++ b/src/liballoc/heap.rs @@ -280,7 +280,7 @@ mod imp { if align <= MIN_ALIGN { libc::malloc(size as libc::size_t) as *mut u8 } else { - let mut out = 0 as *mut libc::c_void; + let mut out = ptr::null(); let ret = posix_memalign(&mut out, align as libc::size_t, size as libc::size_t); |
