diff options
| author | Marco A L Barbosa <malbarbo@gmail.com> | 2017-03-16 16:07:56 -0300 |
|---|---|---|
| committer | Marco A L Barbosa <malbarbo@gmail.com> | 2017-03-25 11:03:06 -0300 |
| commit | a7add43389d435bda8769cb73ac6636237633836 (patch) | |
| tree | 10e07048f54649c77cd81b8946f480343c340ac0 /src/libstd | |
| parent | 6344d087279e0cab9936c31e11e427694529c8f1 (diff) | |
| download | rust-a7add43389d435bda8769cb73ac6636237633836.tar.gz rust-a7add43389d435bda8769cb73ac6636237633836.zip | |
Fix c_char (u8 -> i8) definition for i686-linux-android
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/os/raw.rs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/libstd/os/raw.rs b/src/libstd/os/raw.rs index 68d4ca90019..c34491941d6 100644 --- a/src/libstd/os/raw.rs +++ b/src/libstd/os/raw.rs @@ -14,22 +14,24 @@ use fmt; -#[cfg(any(target_os = "android", - target_os = "emscripten", +#[cfg(any(target_os = "emscripten", all(target_os = "linux", any(target_arch = "aarch64", target_arch = "arm", target_arch = "powerpc", target_arch = "powerpc64", target_arch = "s390x")), + all(target_os = "android", any(target_arch = "aarch64", + target_arch = "arm")), all(target_os = "fuchsia", target_arch = "aarch64")))] #[stable(feature = "raw_os", since = "1.1.0")] pub type c_char = u8; -#[cfg(not(any(target_os = "android", - target_os = "emscripten", +#[cfg(not(any(target_os = "emscripten", all(target_os = "linux", any(target_arch = "aarch64", target_arch = "arm", target_arch = "powerpc", target_arch = "powerpc64", target_arch = "s390x")), + all(target_os = "android", any(target_arch = "aarch64", + target_arch = "arm")), all(target_os = "fuchsia", target_arch = "aarch64"))))] #[stable(feature = "raw_os", since = "1.1.0")] pub type c_char = i8; #[stable(feature = "raw_os", since = "1.1.0")] pub type c_schar = i8; |