diff options
| author | bors <bors@rust-lang.org> | 2015-11-25 20:40:27 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-11-25 20:40:27 +0000 |
| commit | bef2af620187350a49c840099760f24acd21c861 (patch) | |
| tree | 9deb3089b49e1c4d2b88792ccdcda017619a2c96 /src/liballoc_system | |
| parent | 1bb91be05f3e947364de8f6781124003ce2404ab (diff) | |
| parent | 5fb6531903c4e425f48a859463bee20cfcc7f7c5 (diff) | |
| download | rust-bef2af620187350a49c840099760f24acd21c861.tar.gz rust-bef2af620187350a49c840099760f24acd21c861.zip | |
Auto merge of #30017 - nrc:fmt, r=brson
Diffstat (limited to 'src/liballoc_system')
| -rw-r--r-- | src/liballoc_system/lib.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/liballoc_system/lib.rs b/src/liballoc_system/lib.rs index 93b64c9caeb..1befbd61d6d 100644 --- a/src/liballoc_system/lib.rs +++ b/src/liballoc_system/lib.rs @@ -79,7 +79,7 @@ mod imp { use libc; use MIN_ALIGN; - extern { + extern "C" { // Apparently android doesn't have posix_memalign #[cfg(target_os = "android")] fn memalign(align: libc::size_t, size: libc::size_t) -> *mut libc::c_void; @@ -180,7 +180,7 @@ mod imp { } else { let ptr = HeapAlloc(GetProcessHeap(), 0, (size + align) as SIZE_T) as *mut u8; if ptr.is_null() { - return ptr + return ptr; } align_ptr(ptr, align) } @@ -196,7 +196,7 @@ mod imp { header.0 as LPVOID, (size + align) as SIZE_T) as *mut u8; if new.is_null() { - return new + return new; } align_ptr(new, align) } |
