| author |  Andrew Kelley <andrew@ziglang.org> 2019-03-15 18:57:07-04:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2019-03-15 18:57:07-04:00 |
| log | 01fb42103115a58c4b693a600dc5379fedb4ea86 |
| tree | a3eea8feeabdb3baba23bec9d71217d91a623f2b |
| parent | 9c13e9b7ed9806d0f9774433d5e24359aff1b238 |
fix regressions on Windows from previous commit
2 files changed, 3 insertions(+), 2 deletions(-)
std/heap.zig+2-1
| ... | @@ -143,8 +143,9 @@ pub const DirectAllocator = struct { | ... | @@ -143,8 +143,9 @@ pub const DirectAllocator = struct { |
| 143 | return result; | 143 | return result; |
| 144 | }, | 144 | }, |
| 145 | Os.windows => { | 145 | Os.windows => { |
| 146 | const self = @fieldParentPtr(DirectAllocator, "allocator", allocator); | 146 | if (old_mem.len == 0) return alloc(allocator, new_size, new_align); |
| 147 | 147 | ||
| 148 | const self = @fieldParentPtr(DirectAllocator, "allocator", allocator); | ||
| 148 | const old_adjusted_addr = @ptrToInt(old_mem.ptr); | 149 | const old_adjusted_addr = @ptrToInt(old_mem.ptr); |
| 149 | const old_record_addr = old_adjusted_addr + old_mem.len; | 150 | const old_record_addr = old_adjusted_addr + old_mem.len; |
| 150 | const root_addr = @intToPtr(*align(1) usize, old_record_addr).*; | 151 | const root_addr = @intToPtr(*align(1) usize, old_record_addr).*; |
std/os/windows/util.zig+1-1
| ... | @@ -197,7 +197,7 @@ pub fn createWindowsEnvBlock(allocator: *mem.Allocator, env_map: *const BufMap) | ... | @@ -197,7 +197,7 @@ pub fn createWindowsEnvBlock(allocator: *mem.Allocator, env_map: *const BufMap) |
| 197 | i += 1; | 197 | i += 1; |
| 198 | result[i] = 0; | 198 | result[i] = 0; |
| 199 | i += 1; | 199 | i += 1; |
| 200 | return allocator.shrink(u16, result, i); | 200 | return allocator.shrink(result, i); |
| 201 | } | 201 | } |
| 202 | 202 | ||
| 203 | pub fn windowsFindFirstFile( | 203 | pub fn windowsFindFirstFile( |