diff --git a/src/fuchsia/aarch64.rs b/src/fuchsia/aarch64.rs index b822375100948..7a32be766dcf2 100644 --- 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 index bed7a926030fe..8aac5f98026d3 100644 --- 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 index b82b86adcd41e..e47d3b93e1501 100644 --- 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 index 2b470e78d3afe..9363fed788304 100644 --- 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 index e37ccd79c3a55..de1fc78c6fdd2 100644 --- 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 index ceabea397b804..630c7db54b55b 100644 --- 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 index 04cc1542deaeb..01fc7262f03e2 100644 --- 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 index 19c9b6aed344b..0745cb874b14c 100644 --- 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 index 4a8b16e15f568..8a92cad681dde 100644 --- 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 index 40bc0c0549a08..4e554a93452a2 100644 --- a/src/teeos/mod.rs +++ b/src/teeos/mod.rs @@ -5,6 +5,7 @@ #![allow(non_camel_case_types)] #![allow(non_snake_case)] +pub use crate::arch::c_char_def as c_char; use crate::prelude::*; pub type c_schar = i8; @@ -45,9 +46,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 index 60ca11d481613..b066190ba1ac8 100644 --- a/src/trusty.rs +++ b/src/trusty.rs @@ -1,18 +1,12 @@ use crate::prelude::*; +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 index ca94debe88652..d6bd4c6cd6a7b 100644 --- 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 index 7cce58e5d6db3..d2b0694b60a35 100644 --- 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 index d12cd12885b11..fb78cadfb222b 100644 --- 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 index 81d3eb351cdb6..96db5f81f9484 100644 --- 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 index 07492c9333d75..f59320a7f90ac 100644 --- 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 index 0bd678c9821b6..3bb52ea2c2787 100644 --- 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 index e1548a2fa4a09..bb84505b0376c 100644 --- 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 index e425411436d2b..ef47abe424464 100644 --- 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 index 26a27214875e4..37cd8cd4fd400 100644 --- 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 index fca9a126f81c1..f219d420a99bf 100644 --- 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 index 2391801fe458b..d3f3f947798ef 100644 --- 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 index 1f54c8135bf47..2dbe34370b6b8 100644 --- 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::() - 1; diff --git a/src/unix/bsd/netbsdlike/netbsd/mips.rs b/src/unix/bsd/netbsdlike/netbsd/mips.rs index 7129c0f54eb6f..dc9c64ca9a826 100644 --- 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::() - 1; diff --git a/src/unix/bsd/netbsdlike/netbsd/powerpc.rs b/src/unix/bsd/netbsdlike/netbsd/powerpc.rs index a086396ed610a..90ca256155c46 100644 --- 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::() - 1; diff --git a/src/unix/bsd/netbsdlike/netbsd/riscv64.rs b/src/unix/bsd/netbsdlike/netbsd/riscv64.rs index 68cd264aadb78..de3ca17734ac8 100644 --- 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 index d564f58a3e688..c4e35c583e020 100644 --- 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 index 3c55792defcbd..e366a32d035b0 100644 --- 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::() - 1; diff --git a/src/unix/bsd/netbsdlike/netbsd/x86_64.rs b/src/unix/bsd/netbsdlike/netbsd/x86_64.rs index f968e36d67aa2..b84cc7005b65c 100644 --- 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 index bf704757c59d6..ffedae7216736 100644 --- 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 index 1e66ed247a2eb..eb0d03928f5ff 100644 --- 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::() - 1; diff --git a/src/unix/bsd/netbsdlike/openbsd/mips64.rs b/src/unix/bsd/netbsdlike/openbsd/mips64.rs index 15803ced09a08..48704d46cac1b 100644 --- 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 index 1e66ed247a2eb..eb0d03928f5ff 100644 --- 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::() - 1; diff --git a/src/unix/bsd/netbsdlike/openbsd/powerpc64.rs b/src/unix/bsd/netbsdlike/openbsd/powerpc64.rs index cb808719fb8ea..0888e7e3789fb 100644 --- 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::() - 1; diff --git a/src/unix/bsd/netbsdlike/openbsd/riscv64.rs b/src/unix/bsd/netbsdlike/openbsd/riscv64.rs index 6a39f3494dd14..040c0034de923 100644 --- 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 index 070fc9385f6c9..fca4b4fc3f772 100644 --- 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 index 4b495d0c16de8..bf168447c801c 100644 --- 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::() - 1; diff --git a/src/unix/bsd/netbsdlike/openbsd/x86_64.rs b/src/unix/bsd/netbsdlike/openbsd/x86_64.rs index 4380c1d118922..0f0fab5e890eb 100644 --- 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! { diff --git a/src/unix/haiku/mod.rs b/src/unix/haiku/mod.rs index e63a432811990..7aa14e69298e2 100644 --- a/src/unix/haiku/mod.rs +++ b/src/unix/haiku/mod.rs @@ -1,3 +1,4 @@ +pub use crate::arch::c_char_def as c_char; use crate::prelude::*; pub type rlim_t = crate::uintptr_t; @@ -6,7 +7,6 @@ pub type pthread_key_t = c_int; pub type nfds_t = c_ulong; pub type tcflag_t = c_uint; pub type speed_t = c_uchar; -pub type c_char = i8; pub type clock_t = i32; pub type clockid_t = i32; pub type suseconds_t = i32; diff --git a/src/unix/hurd/mod.rs b/src/unix/hurd/mod.rs index 78955110dde45..e7d1b9a6cefb0 100644 --- a/src/unix/hurd/mod.rs +++ b/src/unix/hurd/mod.rs @@ -1,11 +1,10 @@ #![allow(dead_code)] +pub use crate::arch::c_char_def as c_char; use crate::c_schar; use crate::prelude::*; // types -pub type c_char = i8; - pub type __s16_type = c_short; pub type __u16_type = c_ushort; pub type __s32_type = c_int; diff --git a/src/unix/linux_like/android/b32/arm.rs b/src/unix/linux_like/android/b32/arm.rs index 0bf4087fde751..b01f8a390cb20 100644 --- a/src/unix/linux_like/android/b32/arm.rs +++ b/src/unix/linux_like/android/b32/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 wchar_t = u32; pub type greg_t = i32; pub type mcontext_t = sigcontext; diff --git a/src/unix/linux_like/android/b32/x86/mod.rs b/src/unix/linux_like/android/b32/x86/mod.rs index 9f80d8a71f449..56a7129a0f3b3 100644 --- a/src/unix/linux_like/android/b32/x86/mod.rs +++ b/src/unix/linux_like/android/b32/x86/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 wchar_t = i32; pub type greg_t = i32; diff --git a/src/unix/linux_like/android/b64/aarch64/mod.rs b/src/unix/linux_like/android/b64/aarch64/mod.rs index 39d8bc07c4dd5..b902c4b8739a9 100644 --- a/src/unix/linux_like/android/b64/aarch64/mod.rs +++ b/src/unix/linux_like/android/b64/aarch64/mod.rs @@ -1,7 +1,7 @@ +pub use crate::arch::c_char_def as c_char; use crate::off64_t; use crate::prelude::*; -pub type c_char = u8; pub type wchar_t = u32; pub type __u64 = c_ulonglong; pub type __s64 = c_longlong; diff --git a/src/unix/linux_like/android/b64/riscv64/mod.rs b/src/unix/linux_like/android/b64/riscv64/mod.rs index f214fe33702a4..b60ffb9701ac3 100644 --- a/src/unix/linux_like/android/b64/riscv64/mod.rs +++ b/src/unix/linux_like/android/b64/riscv64/mod.rs @@ -1,7 +1,7 @@ +pub use crate::arch::c_char_def as c_char; use crate::off64_t; use crate::prelude::*; -pub type c_char = i8; pub type wchar_t = u32; pub type greg_t = i64; pub type __u64 = c_ulonglong; diff --git a/src/unix/linux_like/android/b64/x86_64/mod.rs b/src/unix/linux_like/android/b64/x86_64/mod.rs index 4da5cd4995679..1eebd17e3f533 100644 --- a/src/unix/linux_like/android/b64/x86_64/mod.rs +++ b/src/unix/linux_like/android/b64/x86_64/mod.rs @@ -1,7 +1,7 @@ +pub use crate::arch::c_char_def as c_char; use crate::off64_t; use crate::prelude::*; -pub type c_char = i8; pub type wchar_t = i32; pub type greg_t = i64; pub type __u64 = c_ulonglong; diff --git a/src/unix/linux_like/emscripten/mod.rs b/src/unix/linux_like/emscripten/mod.rs index ef788152a031b..468c4d0d5161d 100644 --- a/src/unix/linux_like/emscripten/mod.rs +++ b/src/unix/linux_like/emscripten/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 wchar_t = i32; pub type useconds_t = u32; pub type dev_t = u32; diff --git a/src/unix/linux_like/linux/gnu/b32/arm/mod.rs b/src/unix/linux_like/linux/gnu/b32/arm/mod.rs index f3869723996cb..4aad8ab752cab 100644 --- a/src/unix/linux_like/linux/gnu/b32/arm/mod.rs +++ b/src/unix/linux_like/linux/gnu/b32/arm/mod.rs @@ -1,7 +1,7 @@ +pub use crate::arch::c_char_def as c_char; use crate::prelude::*; use crate::{off64_t, off_t}; -pub type c_char = u8; pub type wchar_t = u32; s! { diff --git a/src/unix/linux_like/linux/gnu/b32/csky/mod.rs b/src/unix/linux_like/linux/gnu/b32/csky/mod.rs index eb6f70d8fed07..c280571bc2ef6 100644 --- a/src/unix/linux_like/linux/gnu/b32/csky/mod.rs +++ b/src/unix/linux_like/linux/gnu/b32/csky/mod.rs @@ -1,7 +1,7 @@ +pub use crate::arch::c_char_def as c_char; use crate::prelude::*; use crate::{off64_t, off_t}; -pub type c_char = u8; pub type wchar_t = u32; s! { diff --git a/src/unix/linux_like/linux/gnu/b32/m68k/mod.rs b/src/unix/linux_like/linux/gnu/b32/m68k/mod.rs index 3d252c6253035..bd5270f5b4b3f 100644 --- a/src/unix/linux_like/linux/gnu/b32/m68k/mod.rs +++ b/src/unix/linux_like/linux/gnu/b32/m68k/mod.rs @@ -1,7 +1,7 @@ +pub use crate::arch::c_char_def as c_char; use crate::prelude::*; use crate::{off64_t, off_t}; -pub type c_char = i8; pub type wchar_t = i32; s! { diff --git a/src/unix/linux_like/linux/gnu/b32/mips/mod.rs b/src/unix/linux_like/linux/gnu/b32/mips/mod.rs index 73da7739dabf5..27a1c5ad36a93 100644 --- a/src/unix/linux_like/linux/gnu/b32/mips/mod.rs +++ b/src/unix/linux_like/linux/gnu/b32/mips/mod.rs @@ -1,7 +1,7 @@ +pub use crate::arch::c_char_def as c_char; use crate::prelude::*; use crate::{off64_t, off_t}; -pub type c_char = i8; pub type wchar_t = i32; s! { diff --git a/src/unix/linux_like/linux/gnu/b32/powerpc.rs b/src/unix/linux_like/linux/gnu/b32/powerpc.rs index 75ec2385a1230..fefa4cd4843d1 100644 --- a/src/unix/linux_like/linux/gnu/b32/powerpc.rs +++ b/src/unix/linux_like/linux/gnu/b32/powerpc.rs @@ -1,7 +1,7 @@ +pub use crate::arch::c_char_def as c_char; use crate::prelude::*; use crate::{off64_t, off_t}; -pub type c_char = u8; pub type wchar_t = i32; s! { diff --git a/src/unix/linux_like/linux/gnu/b32/riscv32/mod.rs b/src/unix/linux_like/linux/gnu/b32/riscv32/mod.rs index 43547cc7ad868..c65139a446256 100644 --- a/src/unix/linux_like/linux/gnu/b32/riscv32/mod.rs +++ b/src/unix/linux_like/linux/gnu/b32/riscv32/mod.rs @@ -1,9 +1,9 @@ //! RISC-V-specific definitions for 32-bit linux-like values +pub use crate::arch::c_char_def as c_char; use crate::prelude::*; use crate::{off64_t, off_t}; -pub type c_char = u8; pub type wchar_t = c_int; s! { diff --git a/src/unix/linux_like/linux/gnu/b32/sparc/mod.rs b/src/unix/linux_like/linux/gnu/b32/sparc/mod.rs index cfe62018f5fdd..044c36e1f2bf6 100644 --- a/src/unix/linux_like/linux/gnu/b32/sparc/mod.rs +++ b/src/unix/linux_like/linux/gnu/b32/sparc/mod.rs @@ -1,9 +1,9 @@ //! SPARC-specific definitions for 32-bit linux-like values +pub use crate::arch::c_char_def as c_char; use crate::prelude::*; use crate::{off64_t, off_t}; -pub type c_char = i8; pub type wchar_t = i32; s! { diff --git a/src/unix/linux_like/linux/gnu/b32/x86/mod.rs b/src/unix/linux_like/linux/gnu/b32/x86/mod.rs index d626236dda792..8feb4a2366516 100644 --- a/src/unix/linux_like/linux/gnu/b32/x86/mod.rs +++ b/src/unix/linux_like/linux/gnu/b32/x86/mod.rs @@ -1,7 +1,7 @@ +pub use crate::arch::c_char_def as c_char; use crate::prelude::*; use crate::{off64_t, off_t}; -pub type c_char = i8; pub type wchar_t = i32; pub type greg_t = i32; diff --git a/src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs b/src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs index 27ba5263c5361..50bc6de53a04d 100644 --- a/src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs +++ b/src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs @@ -1,9 +1,9 @@ //! AArch64-specific definitions for 64-bit linux-like values +pub use crate::arch::c_char_def as c_char; use crate::prelude::*; use crate::{off64_t, off_t}; -pub type c_char = u8; pub type wchar_t = u32; pub type nlink_t = u32; pub type blksize_t = i32; diff --git a/src/unix/linux_like/linux/gnu/b64/loongarch64/mod.rs b/src/unix/linux_like/linux/gnu/b64/loongarch64/mod.rs index 8c05659dc09a7..86352f487d414 100644 --- a/src/unix/linux_like/linux/gnu/b64/loongarch64/mod.rs +++ b/src/unix/linux_like/linux/gnu/b64/loongarch64/mod.rs @@ -1,7 +1,7 @@ +pub use crate::arch::c_char_def as c_char; use crate::prelude::*; use crate::{off64_t, off_t, pthread_mutex_t}; -pub type c_char = i8; pub type c_long = i64; pub type c_ulong = u64; pub type wchar_t = i32; diff --git a/src/unix/linux_like/linux/gnu/b64/mips64/mod.rs b/src/unix/linux_like/linux/gnu/b64/mips64/mod.rs index 2d85df1385a10..08fbae5c6d683 100644 --- a/src/unix/linux_like/linux/gnu/b64/mips64/mod.rs +++ b/src/unix/linux_like/linux/gnu/b64/mips64/mod.rs @@ -1,8 +1,8 @@ +pub use crate::arch::c_char_def as c_char; use crate::prelude::*; use crate::{off64_t, off_t, pthread_mutex_t}; pub type blksize_t = i64; -pub type c_char = i8; pub type c_long = i64; pub type c_ulong = u64; pub type nlink_t = u64; diff --git a/src/unix/linux_like/linux/gnu/b64/powerpc64/mod.rs b/src/unix/linux_like/linux/gnu/b64/powerpc64/mod.rs index 86d047dbf3878..f105c259715e8 100644 --- a/src/unix/linux_like/linux/gnu/b64/powerpc64/mod.rs +++ b/src/unix/linux_like/linux/gnu/b64/powerpc64/mod.rs @@ -1,11 +1,11 @@ //! PowerPC64-specific definitions for 64-bit linux-like values +pub use crate::arch::c_char_def as c_char; use crate::prelude::*; use crate::{off64_t, off_t, pthread_mutex_t}; pub type c_long = i64; pub type c_ulong = u64; -pub type c_char = u8; pub type wchar_t = i32; pub type nlink_t = u64; pub type blksize_t = i64; diff --git a/src/unix/linux_like/linux/gnu/b64/riscv64/mod.rs b/src/unix/linux_like/linux/gnu/b64/riscv64/mod.rs index db8deafe896be..1930dc736d12f 100644 --- a/src/unix/linux_like/linux/gnu/b64/riscv64/mod.rs +++ b/src/unix/linux_like/linux/gnu/b64/riscv64/mod.rs @@ -1,9 +1,9 @@ //! RISC-V-specific definitions for 64-bit linux-like values +pub use crate::arch::c_char_def as c_char; use crate::prelude::*; use crate::{off64_t, off_t}; -pub type c_char = u8; pub type c_long = i64; pub type c_ulong = u64; pub type wchar_t = c_int; diff --git a/src/unix/linux_like/linux/gnu/b64/s390x.rs b/src/unix/linux_like/linux/gnu/b64/s390x.rs index 95dacc9f91cbd..655d13d688ef1 100644 --- a/src/unix/linux_like/linux/gnu/b64/s390x.rs +++ b/src/unix/linux_like/linux/gnu/b64/s390x.rs @@ -1,10 +1,10 @@ //! s390x +pub use crate::arch::c_char_def as c_char; use crate::prelude::*; use crate::{off64_t, off_t, pthread_mutex_t}; pub type blksize_t = i64; -pub type c_char = u8; pub type c_long = i64; pub type c_ulong = u64; pub type nlink_t = u64; diff --git a/src/unix/linux_like/linux/gnu/b64/sparc64/mod.rs b/src/unix/linux_like/linux/gnu/b64/sparc64/mod.rs index 5626cd3e46933..f7588180498b6 100644 --- a/src/unix/linux_like/linux/gnu/b64/sparc64/mod.rs +++ b/src/unix/linux_like/linux/gnu/b64/sparc64/mod.rs @@ -1,11 +1,11 @@ //! SPARC64-specific definitions for 64-bit linux-like values +pub use crate::arch::c_char_def as c_char; use crate::prelude::*; use crate::{off64_t, off_t, pthread_mutex_t}; pub type c_long = i64; pub type c_ulong = u64; -pub type c_char = i8; pub type wchar_t = i32; pub type nlink_t = u32; pub type blksize_t = i64; diff --git a/src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs b/src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs index 0d9971252391b..1ff52f934dc27 100644 --- a/src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs +++ b/src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs @@ -1,9 +1,9 @@ //! x86_64-specific definitions for 64-bit linux-like values +pub use crate::arch::c_char_def as c_char; use crate::prelude::*; use crate::{off64_t, off_t}; -pub type c_char = i8; pub type wchar_t = i32; pub type nlink_t = u64; pub type blksize_t = i64; diff --git a/src/unix/linux_like/linux/musl/b32/arm/mod.rs b/src/unix/linux_like/linux/musl/b32/arm/mod.rs index 3116837322b60..241c71f3490ec 100644 --- a/src/unix/linux_like/linux/musl/b32/arm/mod.rs +++ b/src/unix/linux_like/linux/musl/b32/arm/mod.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 wchar_t = u32; s! { diff --git a/src/unix/linux_like/linux/musl/b32/hexagon.rs b/src/unix/linux_like/linux/musl/b32/hexagon.rs index 9becabd146f8d..92393d6081ad9 100644 --- a/src/unix/linux_like/linux/musl/b32/hexagon.rs +++ b/src/unix/linux_like/linux/musl/b32/hexagon.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 wchar_t = u32; pub type stat64 = crate::stat; diff --git a/src/unix/linux_like/linux/musl/b32/mips/mod.rs b/src/unix/linux_like/linux/musl/b32/mips/mod.rs index aacdc44579496..ed17f8ed4b272 100644 --- a/src/unix/linux_like/linux/musl/b32/mips/mod.rs +++ b/src/unix/linux_like/linux/musl/b32/mips/mod.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 = c_int; s! { diff --git a/src/unix/linux_like/linux/musl/b32/powerpc.rs b/src/unix/linux_like/linux/musl/b32/powerpc.rs index 29e797959123d..4e449717c8e8d 100644 --- a/src/unix/linux_like/linux/musl/b32/powerpc.rs +++ b/src/unix/linux_like/linux/musl/b32/powerpc.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 wchar_t = i32; s! { diff --git a/src/unix/linux_like/linux/musl/b32/riscv32/mod.rs b/src/unix/linux_like/linux/musl/b32/riscv32/mod.rs index ff5839c64bc42..fce4bb525683e 100644 --- a/src/unix/linux_like/linux/musl/b32/riscv32/mod.rs +++ b/src/unix/linux_like/linux/musl/b32/riscv32/mod.rs @@ -1,9 +1,9 @@ //! RISC-V-specific definitions for 32-bit linux-like values +pub use crate::arch::c_char_def as c_char; use crate::prelude::*; use crate::{off64_t, off_t}; -pub type c_char = u8; pub type wchar_t = c_int; s! { diff --git a/src/unix/linux_like/linux/musl/b32/x86/mod.rs b/src/unix/linux_like/linux/musl/b32/x86/mod.rs index 476bacdb6b88d..c47b2ccf59f18 100644 --- a/src/unix/linux_like/linux/musl/b32/x86/mod.rs +++ b/src/unix/linux_like/linux/musl/b32/x86/mod.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; s! { diff --git a/src/unix/linux_like/linux/musl/b64/aarch64/mod.rs b/src/unix/linux_like/linux/musl/b64/aarch64/mod.rs index c660ec5c3453f..2971d8b52f9ea 100644 --- a/src/unix/linux_like/linux/musl/b64/aarch64/mod.rs +++ b/src/unix/linux_like/linux/musl/b64/aarch64/mod.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 __s64 = c_longlong; pub type wchar_t = u32; diff --git a/src/unix/linux_like/linux/musl/b64/loongarch64/mod.rs b/src/unix/linux_like/linux/musl/b64/loongarch64/mod.rs index 1be59ada9aad5..49497c588e369 100644 --- a/src/unix/linux_like/linux/musl/b64/loongarch64/mod.rs +++ b/src/unix/linux_like/linux/musl/b64/loongarch64/mod.rs @@ -1,9 +1,9 @@ //! LoongArch-specific definitions for 64-bit linux-like values +pub use crate::arch::c_char_def as c_char; use crate::prelude::*; use crate::{off64_t, off_t}; -pub type c_char = i8; pub type wchar_t = c_int; pub type nlink_t = c_uint; diff --git a/src/unix/linux_like/linux/musl/b64/mips64.rs b/src/unix/linux_like/linux/musl/b64/mips64.rs index 09191a5f8275c..f33c029e44f07 100644 --- a/src/unix/linux_like/linux/musl/b64/mips64.rs +++ b/src/unix/linux_like/linux/musl/b64/mips64.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 __u64 = c_ulong; pub type __s64 = c_long; diff --git a/src/unix/linux_like/linux/musl/b64/powerpc64.rs b/src/unix/linux_like/linux/musl/b64/powerpc64.rs index 3753293c8e0cf..cb4b6d8eac558 100644 --- a/src/unix/linux_like/linux/musl/b64/powerpc64.rs +++ b/src/unix/linux_like/linux/musl/b64/powerpc64.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 wchar_t = i32; pub type __u64 = c_ulong; pub type __s64 = c_long; diff --git a/src/unix/linux_like/linux/musl/b64/riscv64/mod.rs b/src/unix/linux_like/linux/musl/b64/riscv64/mod.rs index ec0ba4c1f926f..98bd8993f6316 100644 --- a/src/unix/linux_like/linux/musl/b64/riscv64/mod.rs +++ b/src/unix/linux_like/linux/musl/b64/riscv64/mod.rs @@ -1,9 +1,9 @@ //! RISC-V-specific definitions for 64-bit linux-like values +pub use crate::arch::c_char_def as c_char; use crate::prelude::*; use crate::{off64_t, off_t}; -pub type c_char = u8; pub type wchar_t = c_int; pub type nlink_t = c_uint; diff --git a/src/unix/linux_like/linux/musl/b64/s390x.rs b/src/unix/linux_like/linux/musl/b64/s390x.rs index 22a6cec4185f0..4b2d2c6bf29f8 100644 --- a/src/unix/linux_like/linux/musl/b64/s390x.rs +++ b/src/unix/linux_like/linux/musl/b64/s390x.rs @@ -1,8 +1,8 @@ +pub use crate::arch::c_char_def as c_char; use crate::off_t; use crate::prelude::*; pub type blksize_t = i64; -pub type c_char = u8; pub type nlink_t = u64; pub type wchar_t = i32; pub type greg_t = u64; diff --git a/src/unix/linux_like/linux/musl/b64/x86_64/mod.rs b/src/unix/linux_like/linux/musl/b64/x86_64/mod.rs index 6399f33209ac2..096f11262245a 100644 --- a/src/unix/linux_like/linux/musl/b64/x86_64/mod.rs +++ b/src/unix/linux_like/linux/musl/b64/x86_64/mod.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/unix/linux_like/linux/uclibc/arm/mod.rs b/src/unix/linux_like/linux/uclibc/arm/mod.rs index da3203f98a3de..4e7aa790c35ba 100644 --- a/src/unix/linux_like/linux/uclibc/arm/mod.rs +++ b/src/unix/linux_like/linux/uclibc/arm/mod.rs @@ -1,7 +1,7 @@ +pub use crate::arch::c_char_def as c_char; use crate::off64_t; use crate::prelude::*; -pub type c_char = u8; pub type wchar_t = c_uint; pub type c_long = i32; pub type c_ulong = u32; diff --git a/src/unix/linux_like/linux/uclibc/mips/mips32/mod.rs b/src/unix/linux_like/linux/uclibc/mips/mips32/mod.rs index 6118928312b91..e3062e72778d1 100644 --- a/src/unix/linux_like/linux/uclibc/mips/mips32/mod.rs +++ b/src/unix/linux_like/linux/uclibc/mips/mips32/mod.rs @@ -1,7 +1,7 @@ +pub use crate::arch::c_char_def as c_char; use crate::off64_t; use crate::prelude::*; -pub type c_char = i8; pub type c_long = i32; pub type c_ulong = u32; pub type clock_t = i32; diff --git a/src/unix/linux_like/linux/uclibc/mips/mips64/mod.rs b/src/unix/linux_like/linux/uclibc/mips/mips64/mod.rs index 86ee7bdff472b..6c604c2bca75f 100644 --- a/src/unix/linux_like/linux/uclibc/mips/mips64/mod.rs +++ b/src/unix/linux_like/linux/uclibc/mips/mips64/mod.rs @@ -1,9 +1,9 @@ +pub use crate::arch::c_char_def as c_char; use crate::off64_t; use crate::prelude::*; pub type blkcnt_t = i64; pub type blksize_t = i64; -pub type c_char = i8; pub type c_long = i64; pub type c_ulong = u64; pub type fsblkcnt_t = c_ulong; diff --git a/src/unix/linux_like/linux/uclibc/x86_64/mod.rs b/src/unix/linux_like/linux/uclibc/x86_64/mod.rs index 07574581d77cc..ddc160329ff81 100644 --- a/src/unix/linux_like/linux/uclibc/x86_64/mod.rs +++ b/src/unix/linux_like/linux/uclibc/x86_64/mod.rs @@ -1,12 +1,12 @@ //! Definitions for uclibc on 64bit systems +pub use crate::arch::c_char_def as c_char; use crate::off64_t; use crate::prelude::*; pub type blkcnt_t = i64; pub type blksize_t = i64; pub type clock_t = i64; -pub type c_char = u8; pub type c_long = i64; pub type c_ulong = u64; pub type fsblkcnt_t = c_ulong; diff --git a/src/unix/newlib/aarch64/mod.rs b/src/unix/newlib/aarch64/mod.rs index 0aa1de7dcc828..067044eb2c78b 100644 --- a/src/unix/newlib/aarch64/mod.rs +++ b/src/unix/newlib/aarch64/mod.rs @@ -1,7 +1,7 @@ +pub use crate::arch::c_char_def as c_char; use crate::prelude::*; pub type clock_t = c_long; -pub type c_char = u8; pub type wchar_t = u32; pub type c_long = i64; diff --git a/src/unix/newlib/arm/mod.rs b/src/unix/newlib/arm/mod.rs index a32e37ede596a..c2fff5bb4e73d 100644 --- a/src/unix/newlib/arm/mod.rs +++ b/src/unix/newlib/arm/mod.rs @@ -1,7 +1,7 @@ +pub use crate::arch::c_char_def as c_char; use crate::prelude::*; pub type clock_t = c_long; -pub type c_char = u8; pub type wchar_t = u32; pub type c_long = i32; diff --git a/src/unix/newlib/espidf/mod.rs b/src/unix/newlib/espidf/mod.rs index 1ac5113c917b5..df02a2aef1fcc 100644 --- a/src/unix/newlib/espidf/mod.rs +++ b/src/unix/newlib/espidf/mod.rs @@ -1,7 +1,7 @@ +pub use crate::arch::c_char_def as c_char; use crate::prelude::*; pub type clock_t = c_ulong; -pub type c_char = u8; pub type wchar_t = u32; pub type c_long = i32; diff --git a/src/unix/newlib/horizon/mod.rs b/src/unix/newlib/horizon/mod.rs index 8c662f2a4517a..0368e46f88430 100644 --- a/src/unix/newlib/horizon/mod.rs +++ b/src/unix/newlib/horizon/mod.rs @@ -1,9 +1,9 @@ //! ARMv6K Nintendo 3DS C Newlib definitions +pub use crate::arch::c_char_def as c_char; use crate::off_t; use crate::prelude::*; -pub type c_char = u8; pub type c_long = i32; pub type c_ulong = u32; diff --git a/src/unix/newlib/powerpc/mod.rs b/src/unix/newlib/powerpc/mod.rs index 6a9c42bdb7228..a775dc03b4deb 100644 --- a/src/unix/newlib/powerpc/mod.rs +++ b/src/unix/newlib/powerpc/mod.rs @@ -1,7 +1,7 @@ +pub use crate::arch::c_char_def as c_char; use crate::prelude::*; pub type clock_t = c_ulong; -pub type c_char = u8; pub type wchar_t = c_int; pub type c_long = i32; diff --git a/src/unix/newlib/vita/mod.rs b/src/unix/newlib/vita/mod.rs index 120c4d54972f5..9250a141943f0 100644 --- a/src/unix/newlib/vita/mod.rs +++ b/src/unix/newlib/vita/mod.rs @@ -1,9 +1,9 @@ +pub use crate::arch::c_char_def as c_char; use crate::off_t; use crate::prelude::*; pub type clock_t = c_long; -pub type c_char = i8; pub type wchar_t = u32; pub type c_long = i32; diff --git a/src/unix/nto/aarch64.rs b/src/unix/nto/aarch64.rs index d0987f28be6b2..028a856b8587d 100644 --- a/src/unix/nto/aarch64.rs +++ b/src/unix/nto/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 wchar_t = u32; pub type c_long = i64; pub type c_ulong = u64; diff --git a/src/unix/nto/x86_64.rs b/src/unix/nto/x86_64.rs index 425f479949466..7c9522d88d895 100644 --- a/src/unix/nto/x86_64.rs +++ b/src/unix/nto/x86_64.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 wchar_t = u32; pub type c_long = i64; pub type c_ulong = u64; diff --git a/src/unix/nuttx/mod.rs b/src/unix/nuttx/mod.rs index 95d1156bfc48b..ed3e1ed8bfa34 100644 --- a/src/unix/nuttx/mod.rs +++ b/src/unix/nuttx/mod.rs @@ -1,3 +1,4 @@ +pub use crate::arch::c_char_def as c_char; use crate::prelude::*; use crate::{in6_addr, in_addr_t, timespec, DIR}; @@ -5,7 +6,6 @@ pub type nlink_t = u16; pub type ino_t = u16; pub type blkcnt_t = u64; pub type blksize_t = i16; -pub type c_char = i8; pub type c_long = isize; pub type c_ulong = usize; pub type cc_t = u8; diff --git a/src/unix/redox/mod.rs b/src/unix/redox/mod.rs index db854dd6300ea..93523253b620c 100644 --- a/src/unix/redox/mod.rs +++ b/src/unix/redox/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 wchar_t = i32; cfg_if! { diff --git a/src/unix/solarish/mod.rs b/src/unix/solarish/mod.rs index 9fce13226afc9..2346aa5670249 100644 --- a/src/unix/solarish/mod.rs +++ b/src/unix/solarish/mod.rs @@ -1,8 +1,8 @@ use core::mem::size_of; +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 caddr_t = *mut c_char; diff --git a/src/vxworks/aarch64.rs b/src/vxworks/aarch64.rs index 4032488b6c0d5..da997749e22df 100644 --- a/src/vxworks/aarch64.rs +++ b/src/vxworks/aarch64.rs @@ -1,4 +1,5 @@ -pub type c_char = u8; +pub use crate::arch::c_char_def as c_char; + pub type wchar_t = u32; pub type c_long = i64; pub type c_ulong = u64; diff --git a/src/vxworks/arm.rs b/src/vxworks/arm.rs index 55240068aa08e..7277a64f47d47 100644 --- a/src/vxworks/arm.rs +++ b/src/vxworks/arm.rs @@ -1,4 +1,5 @@ -pub type c_char = u8; +pub use crate::arch::c_char_def as c_char; + pub type wchar_t = u32; pub type c_long = i32; pub type c_ulong = u32; diff --git a/src/vxworks/powerpc.rs b/src/vxworks/powerpc.rs index 55240068aa08e..7277a64f47d47 100644 --- a/src/vxworks/powerpc.rs +++ b/src/vxworks/powerpc.rs @@ -1,4 +1,5 @@ -pub type c_char = u8; +pub use crate::arch::c_char_def as c_char; + pub type wchar_t = u32; pub type c_long = i32; pub type c_ulong = u32; diff --git a/src/vxworks/powerpc64.rs b/src/vxworks/powerpc64.rs index 4032488b6c0d5..da997749e22df 100644 --- a/src/vxworks/powerpc64.rs +++ b/src/vxworks/powerpc64.rs @@ -1,4 +1,5 @@ -pub type c_char = u8; +pub use crate::arch::c_char_def as c_char; + pub type wchar_t = u32; pub type c_long = i64; pub type c_ulong = u64; diff --git a/src/vxworks/riscv32.rs b/src/vxworks/riscv32.rs index e617bb83c6ce3..5f86b28b160d3 100644 --- a/src/vxworks/riscv32.rs +++ b/src/vxworks/riscv32.rs @@ -1,4 +1,5 @@ -pub type c_char = i8; +pub use crate::arch::c_char_def as c_char; + pub type wchar_t = i32; pub type c_long = i32; pub type c_ulong = u32; diff --git a/src/vxworks/riscv64.rs b/src/vxworks/riscv64.rs index 5e95ea2567ddf..f4493e3e2f405 100644 --- a/src/vxworks/riscv64.rs +++ b/src/vxworks/riscv64.rs @@ -1,4 +1,5 @@ -pub type c_char = i8; +pub use crate::arch::c_char_def as c_char; + pub type wchar_t = i32; pub type c_long = i64; pub type c_ulong = u64; diff --git a/src/vxworks/x86.rs b/src/vxworks/x86.rs index e617bb83c6ce3..5f86b28b160d3 100644 --- a/src/vxworks/x86.rs +++ b/src/vxworks/x86.rs @@ -1,4 +1,5 @@ -pub type c_char = i8; +pub use crate::arch::c_char_def as c_char; + pub type wchar_t = i32; pub type c_long = i32; pub type c_ulong = u32; diff --git a/src/vxworks/x86_64.rs b/src/vxworks/x86_64.rs index 5e95ea2567ddf..f4493e3e2f405 100644 --- a/src/vxworks/x86_64.rs +++ b/src/vxworks/x86_64.rs @@ -1,4 +1,5 @@ -pub type c_char = i8; +pub use crate::arch::c_char_def as c_char; + pub type wchar_t = i32; pub type c_long = i64; pub type c_ulong = u64; diff --git a/src/wasi/mod.rs b/src/wasi/mod.rs index b5e77c5c92eb0..7c0fbd4c937aa 100644 --- a/src/wasi/mod.rs +++ b/src/wasi/mod.rs @@ -5,9 +5,9 @@ use core::iter::Iterator; +pub use crate::arch::c_char_def as c_char; use crate::prelude::*; -pub type c_char = i8; pub type c_uchar = u8; pub type c_schar = i8; pub type c_int = i32; diff --git a/src/windows/mod.rs b/src/windows/mod.rs index 052df670f9b92..af2ec0a858679 100644 --- a/src/windows/mod.rs +++ b/src/windows/mod.rs @@ -1,5 +1,6 @@ //! Windows CRT definitions +pub use crate::arch::c_char_def as c_char; use crate::prelude::*; pub type c_schar = i8; @@ -22,7 +23,6 @@ pub type uintptr_t = usize; pub type ssize_t = isize; pub type sighandler_t = usize; -pub type c_char = i8; pub type c_long = i32; pub type c_ulong = u32; pub type wchar_t = u16; diff --git a/src/xous.rs b/src/xous.rs index 4073349306fb9..24dc278b6b650 100644 --- a/src/xous.rs +++ b/src/xous.rs @@ -1,5 +1,7 @@ //! Xous 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;