diff options
| author | bors <bors@rust-lang.org> | 2015-11-11 20:39:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-11-11 20:39:49 +0000 |
| commit | b8eaa1605a40978c65ebf255dd2e16ef729193c2 (patch) | |
| tree | bde0eeb635074e44db96dc29f546138aa7a732e5 /src/libstd/os | |
| parent | f1f5c04c07f2e888c43cb577810659a7c1d87a00 (diff) | |
| parent | 26705657e4c5e65af270352cc296290cd2108e3f (diff) | |
| download | rust-b8eaa1605a40978c65ebf255dd2e16ef729193c2.tar.gz rust-b8eaa1605a40978c65ebf255dd2e16ef729193c2.zip | |
Auto merge of #29778 - Manishearth:rollup, r=Manishearth
- Successful merges: #29677, #29772, #29775, #29777 - Failed merges:
Diffstat (limited to 'src/libstd/os')
| -rw-r--r-- | src/libstd/os/raw.rs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/libstd/os/raw.rs b/src/libstd/os/raw.rs index 60069cf7bc3..17d6b2605c6 100644 --- a/src/libstd/os/raw.rs +++ b/src/libstd/os/raw.rs @@ -12,9 +12,13 @@ #![stable(feature = "raw_os", since = "1.1.0")] -#[cfg(any(target_arch = "aarch64", target_os = "android"))] +#[cfg(any(target_os = "android", + all(target_os = "linux", any(target_arch = "aarch64", + target_arch = "arm"))))] #[stable(feature = "raw_os", since = "1.1.0")] pub type c_char = u8; -#[cfg(not(any(target_arch = "aarch64", target_os = "android")))] +#[cfg(not(any(target_os = "android", + all(target_os = "linux", any(target_arch = "aarch64", + target_arch = "arm")))))] #[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; #[stable(feature = "raw_os", since = "1.1.0")] pub type c_uchar = u8; |