Do not use tuple structs

21 files changed, 68 insertions, 22 deletions

diff --git a/src/unix/bsd/apple/b32/align.rs b/src/unix/bsd/apple/b32/align.rs
index 374a994b82..3750130a1f 100644
--- a/src/unix/bsd/apple/b32/align.rs
+++ b/src/unix/bsd/apple/b32/align.rs
@@ -1,4 +1,6 @@
 s! {
     #[repr(align(16))]
-    pub struct max_align_t([f64; 2]);
+    pub struct max_align_t {
+        priv_: [f64; 2]
+    }
 }
diff --git a/src/unix/bsd/apple/b64/align.rs b/src/unix/bsd/apple/b64/align.rs
index 374a994b82..3750130a1f 100644
--- a/src/unix/bsd/apple/b64/align.rs
+++ b/src/unix/bsd/apple/b64/align.rs
@@ -1,4 +1,6 @@
 s! {
     #[repr(align(16))]
-    pub struct max_align_t([f64; 2]);
+    pub struct max_align_t {
+        priv_: [f64; 2]
+    }
 }
diff --git a/src/unix/bsd/freebsdlike/freebsd/x86_64/align.rs b/src/unix/bsd/freebsdlike/freebsd/x86_64/align.rs
index 33a0bc5daf..340ad79821 100644
--- a/src/unix/bsd/freebsdlike/freebsd/x86_64/align.rs
+++ b/src/unix/bsd/freebsdlike/freebsd/x86_64/align.rs
@@ -1,4 +1,6 @@
 s! {
     #[repr(align(16))]
-    pub struct max_align_t([f64; 4]);
+    pub struct max_align_t {
+        priv_: [f64; 4]
+    }
 }
diff --git a/src/unix/linux_like/android/b32/x86/align.rs b/src/unix/linux_like/android/b32/x86/align.rs
index b3abe679ae..50c7998373 100644
--- a/src/unix/linux_like/android/b32/x86/align.rs
+++ b/src/unix/linux_like/android/b32/x86/align.rs
@@ -1,4 +1,6 @@
 s! {
     #[repr(align(8))]
-    pub struct max_align_t([f64; 2]);
+    pub struct max_align_t {
+        priv_: [f64; 2]
+    }
 }
diff --git a/src/unix/linux_like/android/b64/aarch64/align.rs b/src/unix/linux_like/android/b64/aarch64/align.rs
index 9531ca4f8b..265118d83c 100644
--- a/src/unix/linux_like/android/b64/aarch64/align.rs
+++ b/src/unix/linux_like/android/b64/aarch64/align.rs
@@ -1,4 +1,6 @@
 s! {
     #[repr(align(16))]
-    pub struct max_align_t([f32; 8]);
+    pub struct max_align_t {
+        priv_: [f32; 8]
+    }
 }
diff --git a/src/unix/linux_like/android/b64/x86_64/align.rs b/src/unix/linux_like/android/b64/x86_64/align.rs
index 33a0bc5daf..340ad79821 100644
--- a/src/unix/linux_like/android/b64/x86_64/align.rs
+++ b/src/unix/linux_like/android/b64/x86_64/align.rs
@@ -1,4 +1,6 @@
 s! {
     #[repr(align(16))]
-    pub struct max_align_t([f64; 4]);
+    pub struct max_align_t {
+        priv_: [f64; 4]
+    }
 }
diff --git a/src/unix/linux_like/emscripten/align.rs b/src/unix/linux_like/emscripten/align.rs
index e024ce08c8..c00a6fbd05 100644
--- a/src/unix/linux_like/emscripten/align.rs
+++ b/src/unix/linux_like/emscripten/align.rs
@@ -2,7 +2,9 @@ macro_rules! expand_align {
     () => {
         s! {
             #[repr(align(8))]
-            pub struct max_align_t([f64; 2]);
+            pub struct max_align_t {
+                priv_: f64; 2]
+            }
 
             #[repr(align(4))]
             pub struct pthread_mutex_t {
diff --git a/src/unix/linux_like/linux/gnu/b32/arm/align.rs b/src/unix/linux_like/linux/gnu/b32/arm/align.rs
index 3817254bff..52fffb7bc7 100644
--- a/src/unix/linux_like/linux/gnu/b32/arm/align.rs
+++ b/src/unix/linux_like/linux/gnu/b32/arm/align.rs
@@ -1,4 +1,6 @@
 s! {
     #[repr(align(8))]
-    pub struct max_align_t([i64; 2]);
+    pub struct max_align_t {
+        priv_: [i64; 2]
+    }
 }
diff --git a/src/unix/linux_like/linux/gnu/b32/mips/align.rs b/src/unix/linux_like/linux/gnu/b32/mips/align.rs
index 8a5f872f5c..7bf5665c2f 100644
--- a/src/unix/linux_like/linux/gnu/b32/mips/align.rs
+++ b/src/unix/linux_like/linux/gnu/b32/mips/align.rs
@@ -1,4 +1,6 @@
 s! {
     #[repr(align(8))]
-    pub struct max_align_t([f32; 4]);
+    pub struct max_align_t {
+        priv_: [f32; 4]
+    }
 }
diff --git a/src/unix/linux_like/linux/gnu/b32/x86/align.rs b/src/unix/linux_like/linux/gnu/b32/x86/align.rs
index afd65bac7d..a1afce4c96 100644
--- a/src/unix/linux_like/linux/gnu/b32/x86/align.rs
+++ b/src/unix/linux_like/linux/gnu/b32/x86/align.rs
@@ -1,4 +1,6 @@
 s! {
     #[repr(align(16))]
-    pub struct max_align_t([f64; 6]);
+    pub struct max_align_t {
+        priv_: [f64; 6]
+    }
 }
diff --git a/src/unix/linux_like/linux/gnu/b64/aarch64/align.rs b/src/unix/linux_like/linux/gnu/b64/aarch64/align.rs
index 9531ca4f8b..265118d83c 100644
--- a/src/unix/linux_like/linux/gnu/b64/aarch64/align.rs
+++ b/src/unix/linux_like/linux/gnu/b64/aarch64/align.rs
@@ -1,4 +1,6 @@
 s! {
     #[repr(align(16))]
-    pub struct max_align_t([f32; 8]);
+    pub struct max_align_t {
+        priv_: [f32; 8]
+    }
 }
diff --git a/src/unix/linux_like/linux/gnu/b64/mips64/align.rs b/src/unix/linux_like/linux/gnu/b64/mips64/align.rs
index 33a0bc5daf..340ad79821 100644
--- a/src/unix/linux_like/linux/gnu/b64/mips64/align.rs
+++ b/src/unix/linux_like/linux/gnu/b64/mips64/align.rs
@@ -1,4 +1,6 @@
 s! {
     #[repr(align(16))]
-    pub struct max_align_t([f64; 4]);
+    pub struct max_align_t {
+        priv_: [f64; 4]
+    }
 }
diff --git a/src/unix/linux_like/linux/gnu/b64/powerpc64/align.rs b/src/unix/linux_like/linux/gnu/b64/powerpc64/align.rs
index 56681afce2..67e0f07817 100644
--- a/src/unix/linux_like/linux/gnu/b64/powerpc64/align.rs
+++ b/src/unix/linux_like/linux/gnu/b64/powerpc64/align.rs
@@ -1,4 +1,6 @@
 s! {
     #[repr(align(16))]
-    pub struct max_align_t([i64; 4]);
+    pub struct max_align_t {
+        priv_: [i64; 4]
+    }
 }
diff --git a/src/unix/linux_like/linux/gnu/b64/sparc64/align.rs b/src/unix/linux_like/linux/gnu/b64/sparc64/align.rs
index 56681afce2..67e0f07817 100644
--- a/src/unix/linux_like/linux/gnu/b64/sparc64/align.rs
+++ b/src/unix/linux_like/linux/gnu/b64/sparc64/align.rs
@@ -1,4 +1,6 @@
 s! {
     #[repr(align(16))]
-    pub struct max_align_t([i64; 4]);
+    pub struct max_align_t {
+        priv_: [i64; 4]
+    }
 }
diff --git a/src/unix/linux_like/linux/gnu/b64/x86_64/align.rs b/src/unix/linux_like/linux/gnu/b64/x86_64/align.rs
index 33a0bc5daf..340ad79821 100644
--- a/src/unix/linux_like/linux/gnu/b64/x86_64/align.rs
+++ b/src/unix/linux_like/linux/gnu/b64/x86_64/align.rs
@@ -1,4 +1,6 @@
 s! {
     #[repr(align(16))]
-    pub struct max_align_t([f64; 4]);
+    pub struct max_align_t {
+        priv_: [f64; 4]
+    }
 }
diff --git a/src/unix/linux_like/linux/musl/b32/arm/align.rs b/src/unix/linux_like/linux/musl/b32/arm/align.rs
index 6b2a39c96f..cb1ab5d22a 100644
--- a/src/unix/linux_like/linux/musl/b32/arm/align.rs
+++ b/src/unix/linux_like/linux/musl/b32/arm/align.rs
@@ -1,4 +1,6 @@
 s! {
     #[repr(align(8))]
-    pub struct max_align_t(i64, i64);
+    pub struct max_align_t {
+        priv_: (i64, i64)
+    }
 }
diff --git a/src/unix/linux_like/linux/musl/b32/mips/align.rs b/src/unix/linux_like/linux/musl/b32/mips/align.rs
index 8a5f872f5c..7bf5665c2f 100644
--- a/src/unix/linux_like/linux/musl/b32/mips/align.rs
+++ b/src/unix/linux_like/linux/musl/b32/mips/align.rs
@@ -1,4 +1,6 @@
 s! {
     #[repr(align(8))]
-    pub struct max_align_t([f32; 4]);
+    pub struct max_align_t {
+        priv_: [f32; 4]
+    }
 }
diff --git a/src/unix/linux_like/linux/musl/b32/x86/align.rs b/src/unix/linux_like/linux/musl/b32/x86/align.rs
index 707d113cf7..6caf90b391 100644
--- a/src/unix/linux_like/linux/musl/b32/x86/align.rs
+++ b/src/unix/linux_like/linux/musl/b32/x86/align.rs
@@ -1,4 +1,6 @@
 s! {
     #[repr(align(8))]
-    pub struct max_align_t([f64; 3]);
+    pub struct max_align_t {
+        priv_: [f64; 3]
+    }
 }
diff --git a/src/unix/linux_like/linux/musl/b64/aarch64/align.rs b/src/unix/linux_like/linux/musl/b64/aarch64/align.rs
index 9531ca4f8b..265118d83c 100644
--- a/src/unix/linux_like/linux/musl/b64/aarch64/align.rs
+++ b/src/unix/linux_like/linux/musl/b64/aarch64/align.rs
@@ -1,4 +1,6 @@
 s! {
     #[repr(align(16))]
-    pub struct max_align_t([f32; 8]);
+    pub struct max_align_t {
+        priv_: [f32; 8]
+    }
 }
diff --git a/src/unix/linux_like/linux/musl/b64/x86_64/align.rs b/src/unix/linux_like/linux/musl/b64/x86_64/align.rs
index 33a0bc5daf..340ad79821 100644
--- a/src/unix/linux_like/linux/musl/b64/x86_64/align.rs
+++ b/src/unix/linux_like/linux/musl/b64/x86_64/align.rs
@@ -1,4 +1,6 @@
 s! {
     #[repr(align(16))]
-    pub struct max_align_t([f64; 4]);
+    pub struct max_align_t {
+        priv_: [f64; 4]
+    }
 }
diff --git a/src/windows/gnu/align.rs b/src/windows/gnu/align.rs
index 5459791ab3..d519b181be 100644
--- a/src/windows/gnu/align.rs
+++ b/src/windows/gnu/align.rs
@@ -1,11 +1,17 @@
 cfg_if! {
     if #[cfg(target_pointer_width = "64")] {
         s! {
-            #[repr(align(16))] pub struct max_align_t([f64; 4]);
+            #[repr(align(16))]
+            pub struct max_align_t {
+                priv_: [f64; 4]
+            }
         }
     } else if #[cfg(target_pointer_width = "32")] {
         s! {
-            #[repr(align(16))] pub struct max_align_t([i64; 6]);
+            #[repr(align(16))]
+            pub struct max_align_t {
+                priv_: [i64; 6]
+            }
         }
     }
 }