From 4ffde0814f43076c944f46890e0b6d401de92ca4 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Wed, 21 Jan 2015 09:23:27 -0800
Subject: Test fixes and rebase conflicts

---
 src/liballoc/heap.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/liballoc/heap.rs')

diff --git a/src/liballoc/heap.rs b/src/liballoc/heap.rs
index 44be0503bc2..a2643f4d0f7 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 = ptr::null();
+            let mut out = ptr::null_mut();
             let ret = posix_memalign(&mut out,
                                      align as libc::size_t,
                                      size as libc::size_t);
-- 
cgit 1.4.1-3-g733a5