From ad0acd959c32546c280c601d34138eb16b2b8205 Mon Sep 17 00:00:00 2001
From: Andy Caldwell <andy.m.caldwell@googlemail.com>
Date: Thu, 21 Nov 2024 20:50:12 +0000
Subject: [PATCH] musl: Rename fields to match musl headers

[ squash "Re-add explicit padding in 32-bit statvfs", reword commit
  summary - Trevor ]

(backport <https://github.com/rust-lang/libc/pull/3261>)
(cherry picked from commit d210d71604be00ea8d2eb2a45009591109a19465)
---
 src/unix/linux_like/linux/musl/mod.rs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/unix/linux_like/linux/musl/mod.rs b/src/unix/linux_like/linux/musl/mod.rs
index 5803874f5ad0b..176ab4009e40c 100644
--- a/src/unix/linux_like/linux/musl/mod.rs
+++ b/src/unix/linux_like/linux/musl/mod.rs
@@ -148,6 +148,8 @@ s! {
 
     // `mips*` targets swap the `s_errno` and `s_code` fields otherwise this struct is
     // target-agnostic (see https://www.openwall.com/lists/musl/2016/01/27/1/2)
+    //
+    // FIXME(union): C implementation uses unions
     pub struct siginfo_t {
         pub si_signo: ::c_int,
         #[cfg(not(target_arch = "mips"))]
@@ -177,12 +179,12 @@ s! {
         #[cfg(target_endian = "little")]
         pub f_fsid: ::c_ulong,
         #[cfg(target_pointer_width = "32")]
-        __f_unused: ::c_int,
+        __pad: ::c_int,
         #[cfg(target_endian = "big")]
         pub f_fsid: ::c_ulong,
         pub f_flag: ::c_ulong,
         pub f_namemax: ::c_ulong,
-        __f_spare: [::c_int; 6],
+        __f_reserved: [::c_int; 6],
     }
 
     pub struct statvfs64 {
@@ -197,12 +199,12 @@ s! {
         #[cfg(target_endian = "little")]
         pub f_fsid: ::c_ulong,
         #[cfg(target_pointer_width = "32")]
-        __f_unused: ::c_int,
+        __pad: ::c_int,
         #[cfg(target_endian = "big")]
         pub f_fsid: ::c_ulong,
         pub f_flag: ::c_ulong,
         pub f_namemax: ::c_ulong,
-        __f_spare: [::c_int; 6],
+        __f_reserved: [::c_int; 6],
     }
 
     pub struct termios {