about summary refs log tree commit diff
path: root/src/libstd/os
diff options
context:
space:
mode:
authorarcnmx <arcnmx@users.noreply.github.com>2015-11-11 14:25:18 -0500
committerarcnmx <arcnmx@users.noreply.github.com>2015-11-11 14:25:18 -0500
commitf9f734748cf3ac6bc5155afe288c0689cb57b918 (patch)
treeab2fa7cffeb3642fa74b0b08e5fb407e7f7abf27 /src/libstd/os
parentfc60b2c73e8c8b00152a1305cd27239b50fdd267 (diff)
downloadrust-f9f734748cf3ac6bc5155afe288c0689cb57b918.tar.gz
rust-f9f734748cf3ac6bc5155afe288c0689cb57b918.zip
Cleaner c_char cfg logic
Diffstat (limited to 'src/libstd/os')
-rw-r--r--src/libstd/os/raw.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libstd/os/raw.rs b/src/libstd/os/raw.rs
index f5d23442562..17d6b2605c6 100644
--- a/src/libstd/os/raw.rs
+++ b/src/libstd/os/raw.rs
@@ -12,13 +12,13 @@
 
 #![stable(feature = "raw_os", since = "1.1.0")]
 
-#[cfg(all(not(target_os = "ios"), not(target_os = "macos"),
-          any(target_arch = "aarch64", target_arch = "arm",
-              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(any(target_os = "ios", target_os = "macos",
-          not(any(target_arch = "aarch64", target_arch = "arm",
-                  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;