]> git.lizzy.rs Git - rust.git/commitdiff
Fix struct stat on arm linux
authorMichał Krasnoborski <mkrdln@gmail.com>
Wed, 4 Mar 2015 21:24:38 +0000 (22:24 +0100)
committerMichał Krasnoborski <mkrdln@gmail.com>
Wed, 4 Mar 2015 21:24:38 +0000 (22:24 +0100)
src/liblibc/lib.rs

index 42143b06ca0e391678583b6e9cfced390ffa897c..04898d90ad0775c0cdeaa79bc5ff060397e4d27c 100644 (file)
@@ -386,7 +386,8 @@ pub mod c99 {
                       target_arch = "mips",
                       target_arch = "mipsel",
                       target_arch = "powerpc",
-                      target_arch = "le32"))]
+                      target_arch = "le32",
+                      all(target_arch = "arm", not(target_os = "android"))))]
             pub mod posix88 {
                 pub type off_t = i32;
                 pub type dev_t = u64;
@@ -398,7 +399,7 @@ pub mod posix88 {
                 pub type mode_t = u32;
                 pub type ssize_t = i32;
             }
-            #[cfg(target_arch = "arm")]
+            #[cfg(all(target_arch = "arm", target_os = "android"))]
             pub mod posix88 {
                 pub type off_t = i32;
                 pub type dev_t = u32;
@@ -412,7 +413,8 @@ pub mod posix88 {
             }
             #[cfg(any(target_arch = "x86",
                       target_arch = "le32",
-                      target_arch = "powerpc"))]
+                      target_arch = "powerpc",
+                      all(target_arch = "arm", not(target_os = "android"))))]
             pub mod posix01 {
                 use types::os::arch::c95::{c_short, c_long, time_t};
                 use types::os::arch::posix88::{dev_t, gid_t, ino_t};
@@ -458,7 +460,7 @@ pub mod posix01 {
                     pub __size: [u32; 9]
                 }
             }
-            #[cfg(target_arch = "arm")]
+            #[cfg(all(target_arch = "arm", target_os = "android"))]
             pub mod posix01 {
                 use types::os::arch::c95::{c_uchar, c_uint, c_ulong, time_t};
                 use types::os::arch::c99::{c_longlong, c_ulonglong};