Skip to content

Commit 0344a78

Browse files
committed
Fix c_char on various targets
- aarch64-kmc-solid_asp3 - armv7a-kmc-solid_asp3-eabi - armv7a-kmc-solid_asp3-eabihf - riscv64-linux-android - x86_64-unknown-l4re-uclibc - armv7-sony-vita-newlibeabihf - riscv32imac-unknown-nuttx-elf - riscv32imafc-unknown-nuttx-elf - riscv32imc-unknown-nuttx-elf - riscv64gc-unknown-nuttx-elf - riscv64imac-unknown-nuttx-elf - thumbv6m-nuttx-eabi - thumbv7em-nuttx-eabi - thumbv7em-nuttx-eabihf - thumbv7m-nuttx-eabi - thumbv8m.base-nuttx-eabi - thumbv8m.main-nuttx-eabi - thumbv8m.main-nuttx-eabihf - aarch64-unknown-redox - aarch64-unknown-illumos - riscv32-wrs-vxworks - riscv64-wrs-vxworks
1 parent 39a6799 commit 0344a78

File tree

10 files changed

+32
-10
lines changed

10 files changed

+32
-10
lines changed

src/solid/aarch64.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pub type c_char = i8;
1+
pub type c_char = u8;
22
pub type wchar_t = u32;
33
pub type c_long = i64;
44
pub type c_ulong = u64;

src/solid/arm.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pub type c_char = i8;
1+
pub type c_char = u8;
22
pub type wchar_t = u32;
33
pub type c_long = i32;
44
pub type c_ulong = u32;

src/unix/linux_like/android/b64/riscv64/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::off64_t;
22
use crate::prelude::*;
33

4-
pub type c_char = i8;
4+
pub type c_char = u8;
55
pub type wchar_t = u32;
66
pub type greg_t = i64;
77
pub type __u64 = c_ulonglong;

src/unix/linux_like/linux/uclibc/x86_64/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use crate::prelude::*;
66
pub type blkcnt_t = i64;
77
pub type blksize_t = i64;
88
pub type clock_t = i64;
9-
pub type c_char = u8;
9+
pub type c_char = i8;
1010
pub type c_long = i64;
1111
pub type c_ulong = u64;
1212
pub type fsblkcnt_t = c_ulong;

src/unix/newlib/vita/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use crate::prelude::*;
33

44
pub type clock_t = c_long;
55

6-
pub type c_char = i8;
6+
pub type c_char = u8;
77
pub type wchar_t = u32;
88

99
pub type c_long = i32;

src/unix/nuttx/mod.rs

+11-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,17 @@ pub type nlink_t = u16;
55
pub type ino_t = u16;
66
pub type blkcnt_t = u64;
77
pub type blksize_t = i16;
8-
pub type c_char = i8;
8+
cfg_if! {
9+
if #[cfg(any(
10+
target_arch = "arm",
11+
target_arch = "riscv32",
12+
target_arch = "riscv64",
13+
))] {
14+
pub type c_char = u8;
15+
} else {
16+
pub type c_char = i8;
17+
}
18+
}
919
pub type c_long = isize;
1020
pub type c_ulong = usize;
1121
pub type cc_t = u8;

src/unix/redox/mod.rs

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
use crate::prelude::*;
22

3-
pub type c_char = i8;
3+
cfg_if! {
4+
if #[cfg(target_arch = "aarch64")] {
5+
pub type c_char = u8;
6+
} else {
7+
pub type c_char = i8;
8+
}
9+
}
410
pub type wchar_t = i32;
511

612
cfg_if! {

src/unix/solarish/mod.rs

+7-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@ use core::mem::size_of;
22

33
use crate::prelude::*;
44

5-
pub type c_char = i8;
5+
cfg_if! {
6+
if #[cfg(target_arch = "aarch64")] {
7+
pub type c_char = u8;
8+
} else {
9+
pub type c_char = i8;
10+
}
11+
}
612
pub type c_long = i64;
713
pub type c_ulong = u64;
814
pub type caddr_t = *mut c_char;

src/vxworks/riscv32.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pub type c_char = i8;
1+
pub type c_char = u8;
22
pub type wchar_t = i32;
33
pub type c_long = i32;
44
pub type c_ulong = u32;

src/vxworks/riscv64.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pub type c_char = i8;
1+
pub type c_char = u8;
22
pub type wchar_t = i32;
33
pub type c_long = i64;
44
pub type c_ulong = u64;

0 commit comments

Comments
 (0)