authorgravatar for quae@daurnimator.comdaurnimator <quae@daurnimator.com> 2019-04-21 18:03:57+10:00
committergravatar for quae@daurnimator.comdaurnimator <quae@daurnimator.com> 2019-04-21 21:50:48+10:00
log9babcac7a650373d9da7945c860fddcabe7050c8
tree7fd662c083468daf1d53c86088f11722db0bcfc5
parentbb25f212b3630eeaac6a76575f21875d7d94e1a4
signature Commit is signed but in an unrecognized format.

std: improve msghdr definition

4 files changed, 27 insertions(+), 16 deletions(-)

std/c/freebsd.zig+10-5
...@@ -42,14 +42,19 @@ pub const pthread_attr_t = extern struct {...@@ -42,14 +42,19 @@ pub const pthread_attr_t = extern struct {
42};42};
4343
44pub const msghdr = extern struct {44pub const msghdr = extern struct {
45 msg_name: *u8,45 /// optional address
46 msg_name: ?*sockaddr,
47 /// size of address
46 msg_namelen: socklen_t,48 msg_namelen: socklen_t,
47 msg_iov: *iovec,49 /// scatter/gather array
50 msg_iov: [*]iovec,
51 /// # elements in msg_iov
48 msg_iovlen: i32,52 msg_iovlen: i32,
49 __pad1: i32,53 /// ancillary data
50 msg_control: *u8,54 msg_control: ?*c_void,
55 /// ancillary data buffer len
51 msg_controllen: socklen_t,56 msg_controllen: socklen_t,
52 __pad2: socklen_t,57 /// flags on received message
53 msg_flags: i32,58 msg_flags: i32,
54};59};
5560
std/c/netbsd.zig+10-5
...@@ -42,14 +42,19 @@ pub const pthread_attr_t = extern struct {...@@ -42,14 +42,19 @@ pub const pthread_attr_t = extern struct {
42};42};
4343
44pub const msghdr = extern struct {44pub const msghdr = extern struct {
45 msg_name: *u8,45 /// optional address
46 msg_name: ?*sockaddr,
47 /// size of address
46 msg_namelen: socklen_t,48 msg_namelen: socklen_t,
47 msg_iov: *iovec,49 /// scatter/gather array
50 msg_iov: [*]iovec,
51 /// # elements in msg_iov
48 msg_iovlen: i32,52 msg_iovlen: i32,
49 __pad1: i32,53 /// ancillary data
50 msg_control: *u8,54 msg_control: ?*c_void,
55 /// ancillary data buffer len
51 msg_controllen: socklen_t,56 msg_controllen: socklen_t,
52 __pad2: socklen_t,57 /// flags on received message
53 msg_flags: i32,58 msg_flags: i32,
54};59};
5560
std/os/linux/arm64.zig+3-3
...@@ -415,12 +415,12 @@ pub fn syscall6(...@@ -415,12 +415,12 @@ pub fn syscall6(
415pub extern fn clone(func: extern fn (arg: usize) u8, stack: usize, flags: u32, arg: usize, ptid: *i32, tls: usize, ctid: *i32) usize;415pub extern fn clone(func: extern fn (arg: usize) u8, stack: usize, flags: u32, arg: usize, ptid: *i32, tls: usize, ctid: *i32) usize;
416416
417pub const msghdr = extern struct {417pub const msghdr = extern struct {
418 msg_name: *u8,418 msg_name: ?*sockaddr,
419 msg_namelen: socklen_t,419 msg_namelen: socklen_t,
420 msg_iov: *iovec,420 msg_iov: [*]iovec,
421 msg_iovlen: i32,421 msg_iovlen: i32,
422 __pad1: i32,422 __pad1: i32,
423 msg_control: *u8,423 msg_control: ?*c_void,
424 msg_controllen: socklen_t,424 msg_controllen: socklen_t,
425 __pad2: socklen_t,425 __pad2: socklen_t,
426 msg_flags: i32,426 msg_flags: i32,
std/os/linux/x86_64.zig+4-3
...@@ -1,5 +1,6 @@...@@ -1,5 +1,6 @@
1const std = @import("../../std.zig");1const std = @import("../../std.zig");
2const linux = std.os.linux;2const linux = std.os.linux;
3const sockaddr = linux.sockaddr;
3const socklen_t = linux.socklen_t;4const socklen_t = linux.socklen_t;
4const iovec = linux.iovec;5const iovec = linux.iovec;
56
...@@ -483,12 +484,12 @@ pub nakedcc fn restore_rt() void {...@@ -483,12 +484,12 @@ pub nakedcc fn restore_rt() void {
483}484}
484485
485pub const msghdr = extern struct {486pub const msghdr = extern struct {
486 msg_name: *u8,487 msg_name: ?*sockaddr,
487 msg_namelen: socklen_t,488 msg_namelen: socklen_t,
488 msg_iov: *iovec,489 msg_iov: [*]iovec,
489 msg_iovlen: i32,490 msg_iovlen: i32,
490 __pad1: i32,491 __pad1: i32,
491 msg_control: *u8,492 msg_control: ?*c_void,
492 msg_controllen: socklen_t,493 msg_controllen: socklen_t,
493 __pad2: socklen_t,494 __pad2: socklen_t,
494 msg_flags: i32,495 msg_flags: i32,