| author |  Andrew Kelley <andrew@ziglang.org> 2018-02-12 03:15:12-05:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2018-02-12 03:15:12-05:00 |
| log | 227ead54be9331f87e5e3e92082dc405ef643e57 |
| tree | b0a345716f667000320e56cb61e28fd8adec8723 |
| parent | 4a4ea92cf38372dc63184957e2936fa7989743fb |
back to malloc instead of aligned_alloc for c_allocator
it seems that a 7 years old standard is still too new for the
libc variants that are ubiquitous
(tests failing on macos for not providing C11 ABI)1 files changed, 2 insertions(+), 1 deletions(-)
std
std/heap.zig+2-1
| ... | ... | @@ -17,7 +17,8 @@ var c_allocator_state = Allocator { |
| 17 | 17 | }; |
| 18 | 18 | |
| 19 | 19 | fn cAlloc(self: &Allocator, n: usize, alignment: u29) ![]u8 { |
| 20 | return if (c.aligned_alloc(alignment, n)) |buf| | |
| 20 | assert(alignment <= @alignOf(c_longdouble)); | |
| 21 | return if (c.malloc(n)) |buf| | |
| 21 | 22 | @ptrCast(&u8, buf)[0..n] |
| 22 | 23 | else |
| 23 | 24 | error.OutOfMemory; |