Commit 5db77e3c66ffaaf67a17bef29e97f073681286ec | zig | Meg's Mirrors

author	Andrew Kelley <andrew@ziglang.org> 2019-11-04 13:25:37-05:00
committer	GitHub <noreply@github.com> 2019-11-04 13:25:37-05:00
log	5db77e3c66ffaaf67a17bef29e97f073681286ec
tree	25b2c000cacf6d07f27b64ea4b1e9e419680ef42
parent	52207f22de29e69c1084b321277b25e5a6aefb04
parent	c8463ce9b04e44c63fcb758d5f746265410412c5
signature	Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #3588 from daurnimator/tiny-std-fixes

Tiny std fixes

2 files changed, 5 insertions(+), 1 deletions(-)

lib
- std
  - c.zig
  - c
    darwin.zig

lib/std/c.zig+4-1

...	...	@@ -61,7 +61,6 @@ pub extern "c" fn abort() noreturn;
61	61	pub extern "c" fn exit(code: c_int) noreturn;
62	62	pub extern "c" fn isatty(fd: fd_t) c_int;
63	63	pub extern "c" fn close(fd: fd_t) c_int;
64		pub extern "c" fn @"close$NOCANCEL"(fd: fd_t) c_int;
65	64	pub extern "c" fn fstat(fd: fd_t, buf: *Stat) c_int;
66	65	pub extern "c" fn @"fstat$INODE64"(fd: fd_t, buf: *Stat) c_int;
67	66	pub extern "c" fn lseek(fd: fd_t, offset: off_t, whence: c_int) off_t;
...	...	@@ -150,6 +149,10 @@ pub extern "c" fn realloc(?c_void, usize) ?c_void;
150	149	pub extern "c" fn free(*c_void) void;
151	150	pub extern "c" fn posix_memalign(memptr: **c_void, alignment: usize, size: usize) c_int;
152	151
	152	// Deprecated
	153	pub extern "c" fn futimes(fd: fd_t, times: *[2]timeval) c_int;
	154	pub extern "c" fn utimes(path: []const u8, times: [2]timeval) c_int;
	155
153	156	pub extern "c" fn utimensat(dirfd: fd_t, pathname: []const u8, times: [2]timespec, flags: u32) c_int;
154	157	pub extern "c" fn futimens(fd: fd_t, times: *const [2]timespec) c_int;
155	158

lib/std/c/darwin.zig+1

...	...	@@ -46,6 +46,7 @@ pub const mach_header = macho.mach_header;
46	46
47	47	pub const _errno = __error;
48	48
	49	pub extern "c" fn @"close$NOCANCEL"(fd: fd_t) c_int;
49	50	pub extern "c" fn mach_host_self() mach_port_t;
50	51	pub extern "c" fn clock_get_time(clock_serv: clock_serv_t, cur_time: *mach_timespec_t) kern_return_t;
51	52	pub extern "c" fn host_get_clock_service(host: host_t, clock_id: clock_id_t, clock_serv: ?[*]clock_serv_t) kern_return_t;