Commit 8bf5a3a5c1b5dd814d6a0fc47a4182ff5ecfe77d | zig

author	Sébastien Marie <semarie@online.fr> 2020-12-14 13:26:53+00:00
committer	Andrew Kelley <andrew@ziglang.org> 2020-12-15 14:49:42-05:00
log	8bf5a3a5c1b5dd814d6a0fc47a4182ff5ecfe77d
tree	c96c4540032e6b7553b64fe92d110489690cb6b8
parent	7cd6c25c8fd21bc984814b7051e7fea6fe446cfb

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

lib/std/os/bits/openbsd.zig+15-15

 @@ -61,18 +61,18 @@ pub const Flock = extern struct {
     l_start: off_t,
     l_len: off_t,
     l_pid: pid_t,
-    l_type: i16,
+    l_type: c_short,
-    l_whence: i16,
+    l_whence: c_short,
 };
 pub const addrinfo = extern struct {
-    flags: i32,
+    flags: c_int,
-    family: i32,
+    family: c_int,
-    socktype: i32,
+    socktype: c_int,
-    protocol: i32,
+    protocol: c_int,
     addrlen: socklen_t,
-    canonname: ?[*:0]u8,
     addr: ?*sockaddr,
+    canonname: ?[*:0]u8,
     next: ?*addrinfo,
 };
 @@ -135,7 +135,7 @@ pub const msghdr = extern struct {
     msg_iov: [*]iovec,
     /// # elements in msg_iov
-    msg_iovlen: i32,
+    msg_iovlen: c_uint,
     /// ancillary data
     msg_control: ?*c_void,
 @@ -144,7 +144,7 @@ pub const msghdr = extern struct {
     msg_controllen: socklen_t,
     /// flags on received message
-    msg_flags: i32,
+    msg_flags: c_int,
 };
 pub const msghdr_const = extern struct {
 @@ -158,7 +158,7 @@ pub const msghdr_const = extern struct {
     msg_iov: [*]iovec_const,
     /// # elements in msg_iov
-    msg_iovlen: i32,
+    msg_iovlen: c_uint,
     /// ancillary data
     msg_control: ?*c_void,
 @@ -167,7 +167,7 @@ pub const msghdr_const = extern struct {
     msg_controllen: socklen_t,
     /// flags on received message
-    msg_flags: i32,
+    msg_flags: c_int,
 };
 pub const libc_stat = extern struct {
 @@ -739,10 +739,10 @@ pub fn WIFSIGNALED(s: u32) bool {
 }
 pub const winsize = extern struct {
-    ws_row: u16,
+    ws_row: c_ushort,
-    ws_col: u16,
+    ws_col: c_ushort,
-    ws_xpixel: u16,
+    ws_xpixel: c_ushort,
-    ws_ypixel: u16,
+    ws_ypixel: c_ushort,
 };
 const NSIG = 33;