| author |  Andrew Kelley <andrew@ziglang.org> 2019-03-25 16:04:25-04:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2019-03-25 16:04:25-04:00 |
| log | 1d09cdaa6a79e0f0baa24d95c7fa992829cd455f |
| tree | e8738804db9ba53b29d81be2681e2aa1e9107223 |
| parent | 5eaead6a56ed95c200e249737c4ecf3c7cacf794 |
munmap allows address 0
fixes test suite regression on macOS from previous commit3 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; | ... | @@ -27,7 +27,7 @@ pub extern "c" fn stat(noalias path: [*]const u8, noalias buf: *Stat) c_int; |
| 27 | pub extern "c" fn write(fd: c_int, buf: *const c_void, nbyte: usize) isize; | 27 | pub extern "c" fn write(fd: c_int, buf: *const c_void, nbyte: usize) isize; |
| 28 | pub extern "c" fn pwrite(fd: c_int, buf: *const c_void, nbyte: usize, offset: u64) isize; | 28 | pub extern "c" fn pwrite(fd: c_int, buf: *const c_void, nbyte: usize, offset: u64) isize; |
| 29 | pub extern "c" fn mmap(addr: ?*c_void, len: usize, prot: c_int, flags: c_int, fd: c_int, offset: isize) ?*c_void; | 29 | pub extern "c" fn mmap(addr: ?*c_void, len: usize, prot: c_int, flags: c_int, fd: c_int, offset: isize) ?*c_void; |
| 30 | pub extern "c" fn munmap(addr: *c_void, len: usize) c_int; | 30 | pub extern "c" fn munmap(addr: ?*c_void, len: usize) c_int; |
| 31 | pub extern "c" fn unlink(path: [*]const u8) c_int; | 31 | pub extern "c" fn unlink(path: [*]const u8) c_int; |
| 32 | pub extern "c" fn getcwd(buf: [*]u8, size: usize) ?[*]u8; | 32 | pub extern "c" fn getcwd(buf: [*]u8, size: usize) ?[*]u8; |
| 33 | pub extern "c" fn waitpid(pid: c_int, stat_loc: *c_int, options: c_int) c_int; | 33 | pub 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 | ... | @@ -677,7 +677,7 @@ pub fn mmap(address: ?[*]u8, length: usize, prot: usize, flags: u32, fd: i32, of |
| 677 | } | 677 | } |
| 678 | 678 | ||
| 679 | pub fn munmap(address: usize, length: usize) usize { | 679 | pub 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)); |
| 681 | } | 681 | } |
| 682 | 682 | ||
| 683 | pub fn unlink(path: [*]const u8) usize { | 683 | pub 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 | ... | @@ -628,7 +628,7 @@ pub fn mmap(address: ?[*]u8, length: usize, prot: usize, flags: u32, fd: i32, of |
| 628 | } | 628 | } |
| 629 | 629 | ||
| 630 | pub fn munmap(address: usize, length: usize) usize { | 630 | pub 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)); |
| 632 | } | 632 | } |
| 633 | 633 | ||
| 634 | pub fn read(fd: i32, buf: [*]u8, nbyte: usize) usize { | 634 | pub fn read(fd: i32, buf: [*]u8, nbyte: usize) usize { |