Skip to content

Commit 184b9c2

Browse files
committed
Fix c_char (u8 -> i8) definition for i686-linux-android
1 parent 4fd93df commit 184b9c2

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

src/libstd/os/raw.rs

+6-4
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,24 @@
1414

1515
use fmt;
1616

17-
#[cfg(any(target_os = "android",
18-
target_os = "emscripten",
17+
#[cfg(any(target_os = "emscripten",
1918
all(target_os = "linux", any(target_arch = "aarch64",
2019
target_arch = "arm",
2120
target_arch = "powerpc",
2221
target_arch = "powerpc64",
2322
target_arch = "s390x")),
23+
all(target_os = "android", any(target_arch = "aarch64",
24+
target_arch = "arm")),
2425
all(target_os = "fuchsia", target_arch = "aarch64")))]
2526
#[stable(feature = "raw_os", since = "1.1.0")] pub type c_char = u8;
26-
#[cfg(not(any(target_os = "android",
27-
target_os = "emscripten",
27+
#[cfg(not(any(target_os = "emscripten",
2828
all(target_os = "linux", any(target_arch = "aarch64",
2929
target_arch = "arm",
3030
target_arch = "powerpc",
3131
target_arch = "powerpc64",
3232
target_arch = "s390x")),
33+
all(target_os = "android", any(target_arch = "aarch64",
34+
target_arch = "arm")),
3335
all(target_os = "fuchsia", target_arch = "aarch64"))))]
3436
#[stable(feature = "raw_os", since = "1.1.0")] pub type c_char = i8;
3537
#[stable(feature = "raw_os", since = "1.1.0")] pub type c_schar = i8;

0 commit comments

Comments
 (0)