Add repr(C) to structs

thepowersgang · Nov 18, 2018 · dac37e7 · dac37e7
1 parent 6ad95c2
commit dac37e7
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/src/impl-aarch64-elf.rs b/src/impl-aarch64-elf.rs
@@ -1,15 +1,16 @@
 use std::{mem, ptr};
 use super::VaPrimitive;
 
+#[repr(C)]
 pub struct VaList(*mut VaListInner);
 
 #[repr(C)]
 #[derive(Debug)]
 #[doc(hidden)]
 pub struct VaListInner {
-    stack: *const (),
-    gr_top: *const (),
-    vr_top: *const (),
+    stack: *const u64,
+    gr_top: *const u64,
+    vr_top: *const u64,
     gr_offs: i32,
     vr_offs: i32,
 }

diff --git a/src/impl-arm-sysv.rs b/src/impl-arm-sysv.rs
@@ -4,7 +4,7 @@
 use std::{mem, ptr};
 use super::VaPrimitive;
 
-#[allow(non_camel_case_types)]
+#[allow(C)]
 pub struct VaList(*const u8);
 
 impl VaList {

diff --git a/src/impl-x86-sysv.rs b/src/impl-x86-sysv.rs
@@ -4,7 +4,7 @@
 use std::{mem, ptr};
 use super::VaPrimitive;
 
-#[allow(non_camel_case_types)]
+#[repr(C)]
 pub struct VaList(*const u8);
 
 impl VaList {

diff --git a/src/impl-x86_64-elf.rs b/src/impl-x86_64-elf.rs
@@ -1,8 +1,10 @@
 // x86_64 ELF - Aka the Itanium ABI
 //
 use std::{mem, ptr};
+use std::ffi::c_void;
 use super::VaPrimitive;
 
+#[repr(C)]
 pub struct VaList(*mut VaListInner);
 // /// Saves the state of the VaList, similar to va_copy
 //impl Clone for VaList { fn clone(&self) -> Self { va_list(self.0) } }
@@ -13,8 +15,8 @@ pub struct VaList(*mut VaListInner);
 pub struct VaListInner {
     gp_offset: u32,
     fp_offset: u32,
-    overflow_arg_area: *const (),
-    reg_save_area: *const (),
+    overflow_arg_area: *const c_void,
+    reg_save_area: *const c_void,
 }
 
 impl VaList {

diff --git a/src/impl-x86_64-win64.rs b/src/impl-x86_64-win64.rs
@@ -4,7 +4,7 @@
 use std::{mem, ptr};
 use super::VaPrimitive;
 
-#[allow(non_camel_case_types)]
+#[repr(C)]
 pub struct VaList(*const u8);
 
 impl VaList {