From fc60b2c73e8c8b00152a1305cd27239b50fdd267 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Wed, 11 Nov 2015 12:02:55 -0500 Subject: Prefer raw::c_char or libc::c_char and fix arm --- src/libstd/os/raw.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/libstd/os') 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; -- cgit 1.4.1-3-g733a5