From 04d5e07d407af5382ec5e721dee485855928318f Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Mon, 31 Jul 2023 11:57:48 -0700
Subject: [PATCH] std.c.openbsd: remove "msg_" prefixes from structs

Reapplies 8f14431bc883898aaf78cc985e2d90716187e882 which was reverted in
95e2605d30c15963c4d6bc9e39751031b0f52007.
---
 lib/std/c/openbsd.zig | 44 ++++++++++++++++---------------------------
 1 file changed, 16 insertions(+), 28 deletions(-)

diff --git a/lib/std/c/openbsd.zig b/lib/std/c/openbsd.zig
index 553b6a2c52..33a60df954 100644
--- a/lib/std/c/openbsd.zig
+++ b/lib/std/c/openbsd.zig
@@ -251,48 +251,36 @@ pub const EAI_MAX = 15;
 
 pub const msghdr = extern struct {
     /// optional address
-    msg_name: ?*sockaddr,
-
+    name: ?*sockaddr,
     /// size of address
-    msg_namelen: socklen_t,
-
+    namelen: socklen_t,
     /// scatter/gather array
-    msg_iov: [*]iovec,
-
-    /// # elements in msg_iov
-    msg_iovlen: c_uint,
-
+    iov: [*]iovec,
+    /// # elements in iov
+    iovlen: c_uint,
     /// ancillary data
-    msg_control: ?*anyopaque,
-
+    control: ?*anyopaque,
     /// ancillary data buffer len
-    msg_controllen: socklen_t,
-
+    controllen: socklen_t,
     /// flags on received message
-    msg_flags: c_int,
+    flags: c_int,
 };
 
 pub const msghdr_const = extern struct {
     /// optional address
-    msg_name: ?*const sockaddr,
-
+    name: ?*const sockaddr,
     /// size of address
-    msg_namelen: socklen_t,
-
+    namelen: socklen_t,
     /// scatter/gather array
-    msg_iov: [*]const iovec_const,
-
-    /// # elements in msg_iov
-    msg_iovlen: c_uint,
-
+    iov: [*]const iovec_const,
+    /// # elements in iov
+    iovlen: c_uint,
     /// ancillary data
-    msg_control: ?*const anyopaque,
-
+    control: ?*const anyopaque,
     /// ancillary data buffer len
-    msg_controllen: socklen_t,
-
+    controllen: socklen_t,
     /// flags on received message
-    msg_flags: c_int,
+    flags: c_int,
 };
 
 pub const Stat = extern struct {