diff options
| author | bors <bors@rust-lang.org> | 2017-09-10 12:48:55 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-09-10 12:48:55 +0000 |
| commit | d290dec97f8bace2a2585505518b109b1e368f4c (patch) | |
| tree | b3973604ffde6b7dce3897b531a7faaf8c0aeb69 /src/liballoc_system | |
| parent | 23aaeb573b626a51af9ecc97680663153e4ab2b0 (diff) | |
| parent | 8a7d93bf6f5b1a699bafec6f59964a3962b2e927 (diff) | |
| download | rust-d290dec97f8bace2a2585505518b109b1e368f4c.tar.gz rust-d290dec97f8bace2a2585505518b109b1e368f4c.zip | |
Auto merge of #44474 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 13 pull requests - Successful merges: #44262, #44329, #44332, #44347, #44372, #44384, #44387, #44396, #44449, #44451, #44457, #44464, #44467 - Failed merges:
Diffstat (limited to 'src/liballoc_system')
| -rw-r--r-- | src/liballoc_system/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/liballoc_system/lib.rs b/src/liballoc_system/lib.rs index 1defe308713..599d79104c3 100644 --- a/src/liballoc_system/lib.rs +++ b/src/liballoc_system/lib.rs @@ -221,7 +221,7 @@ mod platform { } } - #[cfg(any(target_os = "android", target_os = "redox"))] + #[cfg(any(target_os = "android", target_os = "redox", target_os = "solaris"))] #[inline] unsafe fn aligned_malloc(layout: &Layout) -> *mut u8 { // On android we currently target API level 9 which unfortunately @@ -244,7 +244,7 @@ mod platform { libc::memalign(layout.align(), layout.size()) as *mut u8 } - #[cfg(not(any(target_os = "android", target_os = "redox")))] + #[cfg(not(any(target_os = "android", target_os = "redox", target_os = "solaris")))] #[inline] unsafe fn aligned_malloc(layout: &Layout) -> *mut u8 { let mut out = ptr::null_mut(); |