Commit 95e2605d30

Andrew Kelley <andrew@ziglang.org>
2023-07-31 19:49:57
Revert "std.c: msghdr* struct removing prefixes to match linux."
This reverts commit 8f14431bc883898aaf78cc985e2d90716187e882.
master
1 parent 66d5f39
Changed files (6)
lib
std
c
dragonfly.zig
freebsd.zig
haiku.zig
netbsd.zig
openbsd.zig
solaris.zig
lib/std/c/dragonfly.zig
@@ -889,13 +889,13 @@ pub const cmsghdr = extern struct {
     cmsg_type: c_int,
 };
 pub const msghdr = extern struct {
-    name: ?*anyopaque,
-    namelen: socklen_t,
-    iov: [*]iovec,
-    iovlen: c_int,
-    control: ?*anyopaque,
-    controllen: socklen_t,
-    flags: c_int,
+    msg_name: ?*anyopaque,
+    msg_namelen: socklen_t,
+    msg_iov: [*]iovec,
+    msg_iovlen: c_int,
+    msg_control: ?*anyopaque,
+    msg_controllen: socklen_t,
+    msg_flags: c_int,
 };
 pub const cmsgcred = extern struct {
     cmcred_pid: pid_t,
lib/std/c/freebsd.zig
@@ -355,36 +355,36 @@ pub const Flock = extern struct {
 
 pub const msghdr = extern struct {
     /// Optional address.
-    name: ?*sockaddr,
+    msg_name: ?*sockaddr,
     /// Size of address.
-    namelen: socklen_t,
+    msg_namelen: socklen_t,
     /// Scatter/gather array.
-    iov: [*]iovec,
+    msg_iov: [*]iovec,
     /// Number of elements in msg_iov.
-    iovlen: i32,
+    msg_iovlen: i32,
     /// Ancillary data.
-    control: ?*anyopaque,
+    msg_control: ?*anyopaque,
     /// Ancillary data buffer length.
-    controllen: socklen_t,
+    msg_controllen: socklen_t,
     /// Flags on received message.
-    flags: i32,
+    msg_flags: i32,
 };
 
 pub const msghdr_const = extern struct {
     /// Optional address.
-    name: ?*const sockaddr,
+    msg_name: ?*const sockaddr,
     /// Size of address.
-    namelen: socklen_t,
+    msg_namelen: socklen_t,
     /// Scatter/gather array.
-    iov: [*]iovec_const,
+    msg_iov: [*]iovec_const,
     /// Number of elements in msg_iov.
-    iovlen: i32,
+    msg_iovlen: i32,
     /// Ancillary data.
-    control: ?*anyopaque,
+    msg_control: ?*anyopaque,
     /// Ancillary data buffer length.
-    controllen: socklen_t,
+    msg_controllen: socklen_t,
     /// Flags on received message.
-    flags: i32,
+    msg_flags: i32,
 };
 
 pub const Stat = extern struct {
lib/std/c/haiku.zig
@@ -173,25 +173,25 @@ pub const Flock = extern struct {
 
 pub const msghdr = extern struct {
     /// optional address
-    name: ?*sockaddr,
+    msg_name: ?*sockaddr,
 
     /// size of address
-    namelen: socklen_t,
+    msg_namelen: socklen_t,
 
     /// scatter/gather array
-    iov: [*]iovec,
+    msg_iov: [*]iovec,
 
     /// # elements in msg_iov
-    iovlen: i32,
+    msg_iovlen: i32,
 
     /// ancillary data
-    control: ?*anyopaque,
+    msg_control: ?*anyopaque,
 
     /// ancillary data buffer len
-    controllen: socklen_t,
+    msg_controllen: socklen_t,
 
     /// flags on received message
-    flags: i32,
+    msg_flags: i32,
 };
 
 pub const off_t = i64;
lib/std/c/netbsd.zig
@@ -253,48 +253,48 @@ pub const EAI_MAX = 15;
 
 pub const msghdr = extern struct {
     /// optional address
-    name: ?*sockaddr,
+    msg_name: ?*sockaddr,
 
     /// size of address
-    namelen: socklen_t,
+    msg_namelen: socklen_t,
 
     /// scatter/gather array
-    iov: [*]iovec,
+    msg_iov: [*]iovec,
 
     /// # elements in msg_iov
-    iovlen: i32,
+    msg_iovlen: i32,
 
     /// ancillary data
-    control: ?*anyopaque,
+    msg_control: ?*anyopaque,
 
     /// ancillary data buffer len
-    controllen: socklen_t,
+    msg_controllen: socklen_t,
 
     /// flags on received message
-    flags: i32,
+    msg_flags: i32,
 };
 
 pub const msghdr_const = extern struct {
     /// optional address
-    name: ?*const sockaddr,
+    msg_name: ?*const sockaddr,
 
     /// size of address
-    namelen: socklen_t,
+    msg_namelen: socklen_t,
 
     /// scatter/gather array
-    iov: [*]const iovec_const,
+    msg_iov: [*]const iovec_const,
 
     /// # elements in msg_iov
-    iovlen: i32,
+    msg_iovlen: i32,
 
     /// ancillary data
-    control: ?*const anyopaque,
+    msg_control: ?*const anyopaque,
 
     /// ancillary data buffer len
-    controllen: socklen_t,
+    msg_controllen: socklen_t,
 
     /// flags on received message
-    flags: i32,
+    msg_flags: i32,
 };
 
 /// The stat structure used by libc.
lib/std/c/openbsd.zig
@@ -251,48 +251,48 @@ pub const EAI_MAX = 15;
 
 pub const msghdr = extern struct {
     /// optional address
-    name: ?*sockaddr,
+    msg_name: ?*sockaddr,
 
     /// size of address
-    namelen: socklen_t,
+    msg_namelen: socklen_t,
 
     /// scatter/gather array
-    iov: [*]iovec,
+    msg_iov: [*]iovec,
 
     /// # elements in msg_iov
-    iovlen: c_uint,
+    msg_iovlen: c_uint,
 
     /// ancillary data
-    control: ?*anyopaque,
+    msg_control: ?*anyopaque,
 
     /// ancillary data buffer len
-    controllen: socklen_t,
+    msg_controllen: socklen_t,
 
     /// flags on received message
-    flags: c_int,
+    msg_flags: c_int,
 };
 
 pub const msghdr_const = extern struct {
     /// optional address
-    name: ?*const sockaddr,
+    msg_name: ?*const sockaddr,
 
     /// size of address
-    namelen: socklen_t,
+    msg_namelen: socklen_t,
 
     /// scatter/gather array
-    iov: [*]const iovec_const,
+    msg_iov: [*]const iovec_const,
 
     /// # elements in msg_iov
-    iovlen: c_uint,
+    msg_iovlen: c_uint,
 
     /// ancillary data
-    control: ?*const anyopaque,
+    msg_control: ?*const anyopaque,
 
     /// ancillary data buffer len
-    controllen: socklen_t,
+    msg_controllen: socklen_t,
 
     /// flags on received message
-    flags: c_int,
+    msg_flags: c_int,
 };
 
 pub const Stat = extern struct {
lib/std/c/solaris.zig
@@ -183,36 +183,36 @@ pub const EAI_MAX = 14;
 
 pub const msghdr = extern struct {
     /// optional address
-    name: ?*sockaddr,
+    msg_name: ?*sockaddr,
     /// size of address
-    namelen: socklen_t,
+    msg_namelen: socklen_t,
     /// scatter/gather array
-    iov: [*]iovec,
+    msg_iov: [*]iovec,
     /// # elements in msg_iov
-    iovlen: i32,
+    msg_iovlen: i32,
     /// ancillary data
-    control: ?*anyopaque,
+    msg_control: ?*anyopaque,
     /// ancillary data buffer len
-    controllen: socklen_t,
+    msg_controllen: socklen_t,
     /// flags on received message
-    flags: i32,
+    msg_flags: i32,
 };
 
 pub const msghdr_const = extern struct {
     /// optional address
-    name: ?*const sockaddr,
+    msg_name: ?*const sockaddr,
     /// size of address
-    namelen: socklen_t,
+    msg_namelen: socklen_t,
     /// scatter/gather array
-    iov: [*]const iovec_const,
+    msg_iov: [*]const iovec_const,
     /// # elements in msg_iov
-    iovlen: i32,
+    msg_iovlen: i32,
     /// ancillary data
-    control: ?*const anyopaque,
+    msg_control: ?*const anyopaque,
     /// ancillary data buffer len
-    controllen: socklen_t,
+    msg_controllen: socklen_t,
     /// flags on received message
-    flags: i32,
+    msg_flags: i32,
 };
 
 pub const cmsghdr = extern struct {