authorgravatar for semarie@online.frSébastien Marie <semarie@online.fr> 2020-12-14 13:26:53+00:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-12-15 14:49:42-05:00
log8bf5a3a5c1b5dd814d6a0fc47a4182ff5ecfe77d
treec96c4540032e6b7553b64fe92d110489690cb6b8
parent7cd6c25c8fd21bc984814b7051e7fea6fe446cfb

openbsd: correct few structs

- addrinfo: addr and canonname are switched (wrong layout) - addrinfo, Flock, msghdr struct: use proper c_xxx type instead of fixed size. it should help using struct on all architectures supported by openbsd

1 files changed, 15 insertions(+), 15 deletions(-)

lib/std/os/bits/openbsd.zig+15-15
......@@ -61,18 +61,18 @@ pub const Flock = extern struct {
6161 l_start: off_t,
6262 l_len: off_t,
6363 l_pid: pid_t,
64 l_type: i16,
65 l_whence: i16,
64 l_type: c_short,
65 l_whence: c_short,
6666};
6767
6868pub const addrinfo = extern struct {
69 flags: i32,
70 family: i32,
71 socktype: i32,
72 protocol: i32,
69 flags: c_int,
70 family: c_int,
71 socktype: c_int,
72 protocol: c_int,
7373 addrlen: socklen_t,
74 canonname: ?[*:0]u8,
7574 addr: ?*sockaddr,
75 canonname: ?[*:0]u8,
7676 next: ?*addrinfo,
7777};
7878
......@@ -135,7 +135,7 @@ pub const msghdr = extern struct {
135135 msg_iov: [*]iovec,
136136
137137 /// # elements in msg_iov
138 msg_iovlen: i32,
138 msg_iovlen: c_uint,
139139
140140 /// ancillary data
141141 msg_control: ?*c_void,
......@@ -144,7 +144,7 @@ pub const msghdr = extern struct {
144144 msg_controllen: socklen_t,
145145
146146 /// flags on received message
147 msg_flags: i32,
147 msg_flags: c_int,
148148};
149149
150150pub const msghdr_const = extern struct {
......@@ -158,7 +158,7 @@ pub const msghdr_const = extern struct {
158158 msg_iov: [*]iovec_const,
159159
160160 /// # elements in msg_iov
161 msg_iovlen: i32,
161 msg_iovlen: c_uint,
162162
163163 /// ancillary data
164164 msg_control: ?*c_void,
......@@ -167,7 +167,7 @@ pub const msghdr_const = extern struct {
167167 msg_controllen: socklen_t,
168168
169169 /// flags on received message
170 msg_flags: i32,
170 msg_flags: c_int,
171171};
172172
173173pub const libc_stat = extern struct {
......@@ -739,10 +739,10 @@ pub fn WIFSIGNALED(s: u32) bool {
739739}
740740
741741pub const winsize = extern struct {
742 ws_row: u16,
743 ws_col: u16,
744 ws_xpixel: u16,
745 ws_ypixel: u16,
742 ws_row: c_ushort,
743 ws_col: c_ushort,
744 ws_xpixel: c_ushort,
745 ws_ypixel: c_ushort,
746746};
747747
748748const NSIG = 33;