diff options
| author | bors <bors@rust-lang.org> | 2017-08-31 01:16:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-08-31 01:16:17 +0000 |
| commit | 890c87b643264120dc1064ed73df6def974e02fc (patch) | |
| tree | f47e5a797f4d2993b32b1490ff1b1cb0af297976 /src/libstd/os | |
| parent | 7eeac1b81446c6327f1827ef334eca2db7fe28f7 (diff) | |
| parent | b9fea42b7aac3c3236dbff06244685e9ec102eb3 (diff) | |
| download | rust-890c87b643264120dc1064ed73df6def974e02fc.tar.gz rust-890c87b643264120dc1064ed73df6def974e02fc.zip | |
Auto merge of #44186 - alexcrichton:rollup, r=alexcrichton
Rollup of 8 pull requests - Successful merges: #44044, #44089, #44116, #44125, #44154, #44157, #44160, #44172 - Failed merges: #44162
Diffstat (limited to 'src/libstd/os')
| -rw-r--r-- | src/libstd/os/raw.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/libstd/os/raw.rs b/src/libstd/os/raw.rs index c34491941d6..fe0427d4e5f 100644 --- a/src/libstd/os/raw.rs +++ b/src/libstd/os/raw.rs @@ -14,8 +14,7 @@ use fmt; -#[cfg(any(target_os = "emscripten", - all(target_os = "linux", any(target_arch = "aarch64", +#[cfg(any(all(target_os = "linux", any(target_arch = "aarch64", target_arch = "arm", target_arch = "powerpc", target_arch = "powerpc64", @@ -24,8 +23,7 @@ use fmt; 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 = "emscripten", - all(target_os = "linux", any(target_arch = "aarch64", +#[cfg(not(any(all(target_os = "linux", any(target_arch = "aarch64", target_arch = "arm", target_arch = "powerpc", target_arch = "powerpc64", |