diff options
| author | arcnmx <arcnmx@users.noreply.github.com> | 2015-11-11 12:02:55 -0500 |
|---|---|---|
| committer | arcnmx <arcnmx@users.noreply.github.com> | 2015-11-11 12:02:55 -0500 |
| commit | fc60b2c73e8c8b00152a1305cd27239b50fdd267 (patch) | |
| tree | 4c3f62772b4aabf8a349c1ee1c9d83e809648caf /src/libstd/os | |
| parent | 8c743a95d74da5af649a6c6b2608f5f65a0da716 (diff) | |
| download | rust-fc60b2c73e8c8b00152a1305cd27239b50fdd267.tar.gz rust-fc60b2c73e8c8b00152a1305cd27239b50fdd267.zip | |
Prefer raw::c_char or libc::c_char and fix arm
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..f5d23442562 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(all(not(target_os = "ios"), not(target_os = "macos"), + any(target_arch = "aarch64", target_arch = "arm", + target_os = "android")))] #[stable(feature = "raw_os", since = "1.1.0")] pub type c_char = u8; -#[cfg(not(any(target_arch = "aarch64", target_os = "android")))] +#[cfg(any(target_os = "ios", target_os = "macos", + not(any(target_arch = "aarch64", target_arch = "arm", + target_os = "android"))))] #[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; |
