authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-03-25 16:04:25-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-03-25 16:04:25-04:00
log1d09cdaa6a79e0f0baa24d95c7fa992829cd455f
treee8738804db9ba53b29d81be2681e2aa1e9107223
parent5eaead6a56ed95c200e249737c4ecf3c7cacf794

munmap allows address 0

fixes test suite regression on macOS from previous commit

3 files changed, 3 insertions(+), 3 deletions(-)

std/c.zig+1-1
......@@ -27,7 +27,7 @@ pub extern "c" fn stat(noalias path: [*]const u8, noalias buf: *Stat) c_int;
2727pub extern "c" fn write(fd: c_int, buf: *const c_void, nbyte: usize) isize;
2828pub extern "c" fn pwrite(fd: c_int, buf: *const c_void, nbyte: usize, offset: u64) isize;
2929pub extern "c" fn mmap(addr: ?*c_void, len: usize, prot: c_int, flags: c_int, fd: c_int, offset: isize) ?*c_void;
30pub extern "c" fn munmap(addr: *c_void, len: usize) c_int;
30pub extern "c" fn munmap(addr: ?*c_void, len: usize) c_int;
3131pub extern "c" fn unlink(path: [*]const u8) c_int;
3232pub extern "c" fn getcwd(buf: [*]u8, size: usize) ?[*]u8;
3333pub extern "c" fn waitpid(pid: c_int, stat_loc: *c_int, options: c_int) c_int;
std/os/darwin.zig+1-1
......@@ -677,7 +677,7 @@ pub fn mmap(address: ?[*]u8, length: usize, prot: usize, flags: u32, fd: i32, of
677677}
678678
679679pub fn munmap(address: usize, length: usize) usize {
680 return errnoWrap(c.munmap(@intToPtr(*c_void, address), length));
680 return errnoWrap(c.munmap(@intToPtr(?*c_void, address), length));
681681}
682682
683683pub fn unlink(path: [*]const u8) usize {
std/os/freebsd.zig+1-1
......@@ -628,7 +628,7 @@ pub fn mmap(address: ?[*]u8, length: usize, prot: usize, flags: u32, fd: i32, of
628628}
629629
630630pub fn munmap(address: usize, length: usize) usize {
631 return errnoWrap(c.munmap(@intToPtr(*c_void, address), length));
631 return errnoWrap(c.munmap(@intToPtr(?*c_void, address), length));
632632}
633633
634634pub fn read(fd: i32, buf: [*]u8, nbyte: usize) usize {