Allow nix to compile on arm-linux-androideabi

Author: roblabla

src/macros.rs

@@ -130,6 +130,22 @@ macro_rules! libc_bitflags {
         }
     };
 
+    // Munch last ident with as
+    (@accumulate_flags
+        $prefix:tt,
+        [$($flags:tt)*];
+        $flag:ident as $ty:ty
+    ) => {
+        libc_bitflags! {
+            @accumulate_flags
+            $prefix,
+            [
+                $($flags)*
+                const $flag = libc::$flag as $ty;
+            ];
+        }
+    };
+
     // Munch an ident; covers terminating comma case.
     (@accumulate_flags
         $prefix:tt,
@@ -147,6 +163,23 @@ macro_rules! libc_bitflags {
         }
     };
 
+    // Munch an ident; covers terminating comma case with as.
+    (@accumulate_flags
+        $prefix:tt,
+        [$($flags:tt)*];
+        $flag:ident as $ty:ty, $($tail:tt)*
+    ) => {
+        libc_bitflags! {
+            @accumulate_flags
+            $prefix,
+            [
+                $($flags)*
+                const $flag = libc::$flag as $ty;
+            ];
+            $($tail)*
+        }
+    };
+
     // (non-pub) Entry rule.
     (
         $(#[$attr:meta])*

src/sys/signal.rs

@@ -198,6 +198,7 @@ pub const SIGIOT : Signal = SIGABRT;
 pub const SIGPOLL : Signal = SIGIO;
 pub const SIGUNUSED : Signal = SIGSYS;
 
+#[cfg(not(target_os = "android"))]
 libc_bitflags!{
     pub flags SaFlags: libc::c_int {
         SA_NOCLDSTOP,
@@ -210,6 +211,19 @@ libc_bitflags!{
     }
 }
 
+#[cfg(target_os = "android")]
+libc_bitflags!{
+    pub flags SaFlags: libc::c_ulong {
+        SA_NOCLDSTOP as libc::c_ulong,
+        SA_NOCLDWAIT as libc::c_ulong,
+        SA_NODEFER as libc::c_ulong,
+        SA_ONSTACK as libc::c_ulong,
+        SA_RESETHAND as libc::c_ulong,
+        SA_RESTART as libc::c_ulong,
+        SA_SIGINFO as libc::c_ulong,
+    }
+}
+
 #[repr(i32)]
 #[derive(Clone, Copy, PartialEq)]
 pub enum SigmaskHow {

src/sys/termios.rs

@@ -39,7 +39,6 @@ mod ffi {
     pub use self::non_android::*;
 
     // On Android before 5.0, Bionic directly inline these to ioctl() calls.
-    #[inline]
     #[cfg(all(target_os = "android", not(target_arch = "mips")))]
     mod android {
         use libc;