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

rust-lang · Dec 17, 2024 · 7581246 · 7581246
1 parent 92ffa8c
commit 7581246
Show file tree

Hide file tree

Showing 101 changed files with 113 additions and 117 deletions.
diff --git a/src/fuchsia/aarch64.rs b/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;

diff --git a/src/fuchsia/riscv64.rs b/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;
 

diff --git a/src/fuchsia/x86_64.rs b/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;

diff --git a/src/hermit.rs b/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;

diff --git a/src/sgx.rs b/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;
 

diff --git a/src/solid/aarch64.rs b/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;
diff --git a/src/solid/arm.rs b/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;
diff --git a/src/solid/mod.rs b/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;

diff --git a/src/switch.rs b/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;

diff --git a/src/teeos/mod.rs b/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;

diff --git a/src/trusty.rs b/src/trusty.rs
@@ -1,18 +1,12 @@
 pub use core::ffi::c_void;
 
+pub use crate::arch::c_char_def as c_char;
+
 pub type size_t = usize;
 pub type ssize_t = isize;
 
 pub type off_t = i64;
 
-cfg_if! {
-    if #[cfg(any(target_arch = "aarch64", target_arch = "arm"))] {
-        pub type c_char = u8;
-    } else if #[cfg(target_arch = "x86_64")] {
-        pub type c_char = i8;
-    }
-}
-
 pub type c_schar = i8;
 pub type c_uchar = u8;
 pub type c_short = i16;

diff --git a/src/unix/aix/mod.rs b/src/unix/aix/mod.rs
@@ -1,6 +1,6 @@
+pub use crate::arch::c_char_def as c_char;
 use crate::prelude::*;
 
-pub type c_char = u8;
 pub type caddr_t = *mut c_char;
 pub type clockid_t = c_longlong;
 pub type blkcnt_t = c_long;

diff --git a/src/unix/bsd/apple/mod.rs b/src/unix/bsd/apple/mod.rs
@@ -2,10 +2,10 @@
 //!
 //! This covers *-apple-* triples currently
 
+pub use crate::arch::c_char_def as c_char;
 use crate::prelude::*;
 use crate::{cmsghdr, off_t};
 
-pub type c_char = i8;
 pub type wchar_t = i32;
 pub type clock_t = c_ulong;
 pub type time_t = c_long;

diff --git a/src/unix/bsd/freebsdlike/dragonfly/mod.rs b/src/unix/bsd/freebsdlike/dragonfly/mod.rs
@@ -1,8 +1,8 @@
+pub use crate::arch::c_char_def as c_char;
 use crate::prelude::*;
 use crate::{cmsghdr, off_t};
 
 pub type dev_t = u32;
-pub type c_char = i8;
 pub type wchar_t = i32;
 pub type clock_t = u64;
 pub type ino_t = u64;

diff --git a/src/unix/bsd/freebsdlike/freebsd/aarch64.rs b/src/unix/bsd/freebsdlike/freebsd/aarch64.rs
@@ -1,6 +1,6 @@
+pub use crate::arch::c_char_def as c_char;
 use crate::prelude::*;
 
-pub type c_char = u8;
 pub type c_long = i64;
 pub type c_ulong = u64;
 pub type clock_t = i32;

diff --git a/src/unix/bsd/freebsdlike/freebsd/arm.rs b/src/unix/bsd/freebsdlike/freebsd/arm.rs
@@ -1,6 +1,6 @@
+pub use crate::arch::c_char_def as c_char;
 use crate::prelude::*;
 
-pub type c_char = u8;
 pub type c_long = i32;
 pub type c_ulong = u32;
 pub type clock_t = u32;

diff --git a/src/unix/bsd/freebsdlike/freebsd/powerpc.rs b/src/unix/bsd/freebsdlike/freebsd/powerpc.rs
@@ -1,6 +1,6 @@
+pub use crate::arch::c_char_def as c_char;
 use crate::prelude::*;
 
-pub type c_char = u8;
 pub type c_long = i32;
 pub type c_ulong = u32;
 pub type clock_t = u32;

diff --git a/src/unix/bsd/freebsdlike/freebsd/powerpc64.rs b/src/unix/bsd/freebsdlike/freebsd/powerpc64.rs
@@ -1,6 +1,6 @@
+pub use crate::arch::c_char_def as c_char;
 use crate::prelude::*;
 
-pub type c_char = u8;
 pub type c_long = i64;
 pub type c_ulong = u64;
 pub type clock_t = u32;

diff --git a/src/unix/bsd/freebsdlike/freebsd/riscv64.rs b/src/unix/bsd/freebsdlike/freebsd/riscv64.rs
@@ -1,6 +1,6 @@
+pub use crate::arch::c_char_def as c_char;
 use crate::prelude::*;
 
-pub type c_char = u8;
 pub type c_long = i64;
 pub type c_ulong = u64;
 pub type clock_t = i32;

diff --git a/src/unix/bsd/freebsdlike/freebsd/x86.rs b/src/unix/bsd/freebsdlike/freebsd/x86.rs
@@ -1,6 +1,6 @@
+pub use crate::arch::c_char_def as c_char;
 use crate::prelude::*;
 
-pub type c_char = i8;
 pub type c_long = i32;
 pub type c_ulong = u32;
 pub type clock_t = c_ulong;

diff --git a/src/unix/bsd/freebsdlike/freebsd/x86_64/mod.rs b/src/unix/bsd/freebsdlike/freebsd/x86_64/mod.rs
@@ -1,6 +1,6 @@
+pub use crate::arch::c_char_def as c_char;
 use crate::prelude::*;
 
-pub type c_char = i8;
 pub type c_long = i64;
 pub type c_ulong = u64;
 pub type clock_t = i32;

diff --git a/src/unix/bsd/netbsdlike/netbsd/aarch64.rs b/src/unix/bsd/netbsdlike/netbsd/aarch64.rs
@@ -1,9 +1,9 @@
+pub use crate::arch::c_char_def as c_char;
 use crate::prelude::*;
 use crate::PT_FIRSTMACH;
 
 pub type c_long = i64;
 pub type c_ulong = u64;
-pub type c_char = u8;
 pub type greg_t = u64;
 pub type __cpu_simple_lock_nv_t = c_uchar;
 

diff --git a/src/unix/bsd/netbsdlike/netbsd/arm.rs b/src/unix/bsd/netbsdlike/netbsd/arm.rs
@@ -1,9 +1,9 @@
+pub use crate::arch::c_char_def as c_char;
 use crate::prelude::*;
 use crate::PT_FIRSTMACH;
 
 pub type c_long = i32;
 pub type c_ulong = u32;
-pub type c_char = u8;
 pub type __cpu_simple_lock_nv_t = c_int;
 
 pub(crate) const _ALIGNBYTES: usize = mem::size_of::<c_longlong>() - 1;

diff --git a/src/unix/bsd/netbsdlike/netbsd/mips.rs b/src/unix/bsd/netbsdlike/netbsd/mips.rs
@@ -1,9 +1,9 @@
+pub use crate::arch::c_char_def as c_char;
 use crate::prelude::*;
 use crate::PT_FIRSTMACH;
 
 pub type c_long = i32;
 pub type c_ulong = u32;
-pub type c_char = i8;
 pub type __cpu_simple_lock_nv_t = c_int;
 
 pub(crate) const _ALIGNBYTES: usize = mem::size_of::<c_longlong>() - 1;

diff --git a/src/unix/bsd/netbsdlike/netbsd/powerpc.rs b/src/unix/bsd/netbsdlike/netbsd/powerpc.rs
@@ -1,9 +1,9 @@
+pub use crate::arch::c_char_def as c_char;
 use crate::prelude::*;
 use crate::PT_FIRSTMACH;
 
 pub type c_long = i32;
 pub type c_ulong = u32;
-pub type c_char = u8;
 pub type __cpu_simple_lock_nv_t = c_int;
 
 pub(crate) const _ALIGNBYTES: usize = mem::size_of::<c_double>() - 1;

diff --git a/src/unix/bsd/netbsdlike/netbsd/riscv64.rs b/src/unix/bsd/netbsdlike/netbsd/riscv64.rs
@@ -1,10 +1,10 @@
 use PT_FIRSTMACH;
 
+pub use crate::arch::c_char_def as c_char;
 use crate::prelude::*;
 
 pub type c_long = i64;
 pub type c_ulong = u64;
-pub type c_char = u8;
 pub type __greg_t = u64;
 pub type __cpu_simple_lock_nv_t = c_int;
 pub type __gregset = [__greg_t; _NGREG];

diff --git a/src/unix/bsd/netbsdlike/netbsd/sparc64.rs b/src/unix/bsd/netbsdlike/netbsd/sparc64.rs
@@ -1,8 +1,8 @@
+pub use crate::arch::c_char_def as c_char;
 use crate::prelude::*;
 
 pub type c_long = i64;
 pub type c_ulong = u64;
-pub type c_char = i8;
 pub type __cpu_simple_lock_nv_t = c_uchar;
 
 // should be pub(crate), but that requires Rust 1.18.0

diff --git a/src/unix/bsd/netbsdlike/netbsd/x86.rs b/src/unix/bsd/netbsdlike/netbsd/x86.rs
@@ -1,8 +1,8 @@
+pub use crate::arch::c_char_def as c_char;
 use crate::prelude::*;
 
 pub type c_long = i32;
 pub type c_ulong = u32;
-pub type c_char = i8;
 pub type __cpu_simple_lock_nv_t = c_uchar;
 
 pub(crate) const _ALIGNBYTES: usize = mem::size_of::<c_int>() - 1;
diff --git a/src/unix/bsd/netbsdlike/netbsd/x86_64.rs b/src/unix/bsd/netbsdlike/netbsd/x86_64.rs
@@ -1,9 +1,9 @@
+pub use crate::arch::c_char_def as c_char;
 use crate::prelude::*;
 use crate::PT_FIRSTMACH;
 
 pub type c_long = i64;
 pub type c_ulong = u64;
-pub type c_char = i8;
 pub type c___greg_t = u64;
 pub type __cpu_simple_lock_nv_t = c_uchar;
 

diff --git a/src/unix/bsd/netbsdlike/openbsd/aarch64.rs b/src/unix/bsd/netbsdlike/openbsd/aarch64.rs
@@ -1,8 +1,8 @@
+pub use crate::arch::c_char_def as c_char;
 use crate::prelude::*;
 
 pub type c_long = i64;
 pub type c_ulong = u64;
-pub type c_char = u8;
 pub type ucontext_t = sigcontext;
 
 s! {

diff --git a/src/unix/bsd/netbsdlike/openbsd/arm.rs b/src/unix/bsd/netbsdlike/openbsd/arm.rs
@@ -1,8 +1,8 @@
+pub use crate::arch::c_char_def as c_char;
 use crate::prelude::*;
 
 pub type c_long = i32;
 pub type c_ulong = u32;
-pub type c_char = u8;
 
 pub(crate) const _ALIGNBYTES: usize = mem::size_of::<c_double>() - 1;
 

diff --git a/src/unix/bsd/netbsdlike/openbsd/mips64.rs b/src/unix/bsd/netbsdlike/openbsd/mips64.rs
@@ -1,6 +1,7 @@
+pub use crate::arch::c_char_def as c_char;
+
 pub type c_long = i64;
 pub type c_ulong = u64;
-pub type c_char = i8;
 
 #[doc(hidden)]
 pub const _ALIGNBYTES: usize = 7;

diff --git a/src/unix/bsd/netbsdlike/openbsd/powerpc.rs b/src/unix/bsd/netbsdlike/openbsd/powerpc.rs
@@ -1,8 +1,8 @@
+pub use crate::arch::c_char_def as c_char;
 use crate::prelude::*;
 
 pub type c_long = i32;
 pub type c_ulong = u32;
-pub type c_char = u8;
 
 pub(crate) const _ALIGNBYTES: usize = mem::size_of::<c_double>() - 1;
 

diff --git a/src/unix/bsd/netbsdlike/openbsd/powerpc64.rs b/src/unix/bsd/netbsdlike/openbsd/powerpc64.rs
@@ -1,8 +1,8 @@
+pub use crate::arch::c_char_def as c_char;
 use crate::prelude::*;
 
 pub type c_long = i64;
 pub type c_ulong = u64;
-pub type c_char = u8;
 
 pub(crate) const _ALIGNBYTES: usize = mem::size_of::<c_long>() - 1;
 

diff --git a/src/unix/bsd/netbsdlike/openbsd/riscv64.rs b/src/unix/bsd/netbsdlike/openbsd/riscv64.rs
@@ -1,8 +1,8 @@
+pub use crate::arch::c_char_def as c_char;
 use crate::prelude::*;
 
 pub type c_long = i64;
 pub type c_ulong = u64;
-pub type c_char = u8;
 pub type ucontext_t = sigcontext;
 
 s! {

diff --git a/src/unix/bsd/netbsdlike/openbsd/sparc64.rs b/src/unix/bsd/netbsdlike/openbsd/sparc64.rs
@@ -1,6 +1,7 @@
+pub use crate::arch::c_char_def as c_char;
+
 pub type c_long = i64;
 pub type c_ulong = u64;
-pub type c_char = i8;
 
 #[doc(hidden)]
 pub const _ALIGNBYTES: usize = 0xf;

diff --git a/src/unix/bsd/netbsdlike/openbsd/x86.rs b/src/unix/bsd/netbsdlike/openbsd/x86.rs
@@ -1,8 +1,8 @@
+pub use crate::arch::c_char_def as c_char;
 use crate::prelude::*;
 
 pub type c_long = i32;
 pub type c_ulong = u32;
-pub type c_char = i8;
 
 pub(crate) const _ALIGNBYTES: usize = mem::size_of::<c_int>() - 1;
 

diff --git a/src/unix/bsd/netbsdlike/openbsd/x86_64.rs b/src/unix/bsd/netbsdlike/openbsd/x86_64.rs
@@ -1,9 +1,9 @@
+pub use crate::arch::c_char_def as c_char;
 use crate::prelude::*;
 use crate::PT_FIRSTMACH;
 
 pub type c_long = i64;
 pub type c_ulong = u64;
-pub type c_char = i8;
 pub type ucontext_t = sigcontext;
 
 s! {