Re-export c_char_def as c_char instead of defining c_char per target

Author: taiki-e

src/fuchsia/aarch64.rs

@@ -1,7 +1,7 @@
+pub use crate::arch::c_char_def as c_char;
 use crate::off_t;
 use crate::prelude::*;
 
-pub type c_char = u8;
 pub type __u64 = c_ulonglong;
 pub type wchar_t = u32;
 pub type nlink_t = c_ulong;

src/fuchsia/riscv64.rs

@@ -1,8 +1,8 @@
+pub use crate::arch::c_char_def as c_char;
 use crate::off_t;
 use crate::prelude::*;
 
 // From psABI Calling Convention for RV64
-pub type c_char = u8;
 pub type __u64 = c_ulonglong;
 pub type wchar_t = i32;
 

src/fuchsia/x86_64.rs

@@ -1,7 +1,7 @@
+pub use crate::arch::c_char_def as c_char;
 use crate::off_t;
 use crate::prelude::*;
 
-pub type c_char = i8;
 pub type wchar_t = i32;
 pub type nlink_t = u64;
 pub type blksize_t = c_long;

src/hermit.rs

@@ -1,15 +1,8 @@
 //! Hermit C type definitions
 
+pub use crate::arch::c_char_def as c_char;
 use crate::prelude::*;
 
-cfg_if! {
-    if #[cfg(any(target_arch = "aarch64", target_arch = "riscv64"))] {
-        pub type c_char = u8;
-    } else {
-        pub type c_char = i8;
-    }
-}
-
 pub type c_schar = i8;
 pub type c_uchar = u8;
 pub type c_short = i16;

src/sgx.rs

@@ -1,5 +1,7 @@
 //! SGX C types definition
 
+pub use crate::arch::c_char_def as c_char;
+
 pub type c_schar = i8;
 pub type c_uchar = u8;
 pub type c_short = i16;
@@ -19,7 +21,6 @@ pub type intptr_t = isize;
 pub type uintptr_t = usize;
 pub type ssize_t = isize;
 
-pub type c_char = i8;
 pub type c_long = i64;
 pub type c_ulong = u64;
 

src/solid/aarch64.rs

@@ -1,4 +1,3 @@
-pub type c_char = i8;
 pub type wchar_t = u32;
 pub type c_long = i64;
 pub type c_ulong = u64;

src/solid/arm.rs

@@ -1,4 +1,3 @@
-pub type c_char = i8;
 pub type wchar_t = u32;
 pub type c_long = i32;
 pub type c_ulong = u32;

src/solid/mod.rs

@@ -2,6 +2,7 @@
 //!
 //! [SOLID]: https://solid.kmckk.com/
 
+pub use crate::arch::c_char_def as c_char;
 use crate::prelude::*;
 
 pub type c_schar = i8;

src/switch.rs

@@ -1,5 +1,7 @@
 //! Switch C type definitions
 
+pub use crate::arch::c_char_def as c_char;
+
 pub type c_schar = i8;
 pub type c_uchar = u8;
 pub type c_short = i16;
@@ -20,7 +22,6 @@ pub type uintptr_t = usize;
 pub type ssize_t = isize;
 
 pub type off_t = i64;
-pub type c_char = u8;
 pub type c_long = i64;
 pub type c_ulong = u64;
 pub type wchar_t = u32;

src/teeos/mod.rs

@@ -8,6 +8,7 @@
 // only supported on Rust > 1.59, so we can directly reexport c_void from core.
 pub use core::ffi::c_void;
 
+pub use crate::arch::c_char_def as c_char;
 use crate::prelude::*;
 
 pub type c_schar = i8;
@@ -48,9 +49,6 @@ pub type ssize_t = isize;
 
 pub type pid_t = c_int;
 
-// aarch64 specific
-pub type c_char = u8;
-
 pub type wchar_t = u32;
 
 pub type c_long = i64;