Fix android SA_* constants

rust-lang · Feb 3, 2017 · a42b0ea · a42b0ea
1 parent 04d2c7a
commit a42b0ea
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/src/unix/notbsd/android/b32.rs b/src/unix/notbsd/android/b32.rs
@@ -3,6 +3,15 @@ pub type c_ulong = u32;
 pub type mode_t = u16;
 pub type off64_t = ::c_longlong;
 
+// These constants must be of the same type of sigaction.sa_flags
+pub const SA_NOCLDSTOP: ::c_ulong = 0x00000001;
+pub const SA_NOCLDWAIT: ::c_ulong = 0x00000002;
+pub const SA_NODEFER: ::c_ulong = 0x40000000;
+pub const SA_ONSTACK: ::c_ulong = 0x08000000;
+pub const SA_RESETHAND: ::c_ulong = 0x80000000;
+pub const SA_RESTART: ::c_ulong = 0x10000000;
+pub const SA_SIGINFO: ::c_ulong = 0x00000004;
+
 s! {
     pub struct sigaction {
         pub sa_sigaction: ::sighandler_t,

diff --git a/src/unix/notbsd/android/b64.rs b/src/unix/notbsd/android/b64.rs
@@ -5,6 +5,15 @@ pub type c_ulong = u64;
 pub type mode_t = u32;
 pub type off64_t = i64;
 
+// These constants must be of the same type of sigaction.sa_flags
+pub const SA_NOCLDSTOP: ::c_uint = 0x00000001;
+pub const SA_NOCLDWAIT: ::c_uint = 0x00000002;
+pub const SA_NODEFER: ::c_uint = 0x40000000;
+pub const SA_ONSTACK: ::c_uint = 0x08000000;
+pub const SA_RESETHAND: ::c_uint = 0x80000000;
+pub const SA_RESTART: ::c_uint = 0x10000000;
+pub const SA_SIGINFO: ::c_uint = 0x00000004;
+
 s! {
     pub struct sigaction {
         pub sa_flags: ::c_uint,

diff --git a/src/unix/notbsd/android/mod.rs b/src/unix/notbsd/android/mod.rs
@@ -157,11 +157,6 @@ pub const ECOMM: ::c_int = 70;
 pub const EPROTO: ::c_int = 71;
 pub const EDOTDOT: ::c_int = 73;
 
-pub const SA_NODEFER: ::c_int = 0x40000000;
-pub const SA_RESETHAND: ::c_int = 0x80000000;
-pub const SA_RESTART: ::c_int = 0x10000000;
-pub const SA_NOCLDSTOP: ::c_int = 0x00000001;
-
 pub const EPOLL_CLOEXEC: ::c_int = 0x80000;
 
 pub const EFD_CLOEXEC: ::c_int = 0x80000;
@@ -253,9 +248,6 @@ pub const PTHREAD_MUTEX_DEFAULT: ::c_int = PTHREAD_MUTEX_NORMAL;
 
 pub const FIOCLEX: ::c_int = 0x5451;
 
-pub const SA_ONSTACK: ::c_ulong = 0x08000000;
-pub const SA_SIGINFO: ::c_ulong = 0x00000004;
-pub const SA_NOCLDWAIT: ::c_ulong = 0x00000002;
 pub const SIGCHLD: ::c_int = 17;
 pub const SIGBUS: ::c_int = 7;
 pub const SIGUSR1: ::c_int = 10;