Skip to content

Commit a42b0ea

Browse files
committed
Fix android SA_* constants
1 parent 04d2c7a commit a42b0ea

File tree

3 files changed

+18
-8
lines changed

3 files changed

+18
-8
lines changed

src/unix/notbsd/android/b32.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,15 @@ pub type c_ulong = u32;
33
pub type mode_t = u16;
44
pub type off64_t = ::c_longlong;
55

6+
// These constants must be of the same type of sigaction.sa_flags
7+
pub const SA_NOCLDSTOP: ::c_ulong = 0x00000001;
8+
pub const SA_NOCLDWAIT: ::c_ulong = 0x00000002;
9+
pub const SA_NODEFER: ::c_ulong = 0x40000000;
10+
pub const SA_ONSTACK: ::c_ulong = 0x08000000;
11+
pub const SA_RESETHAND: ::c_ulong = 0x80000000;
12+
pub const SA_RESTART: ::c_ulong = 0x10000000;
13+
pub const SA_SIGINFO: ::c_ulong = 0x00000004;
14+
615
s! {
716
pub struct sigaction {
817
pub sa_sigaction: ::sighandler_t,

src/unix/notbsd/android/b64.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,15 @@ pub type c_ulong = u64;
55
pub type mode_t = u32;
66
pub type off64_t = i64;
77

8+
// These constants must be of the same type of sigaction.sa_flags
9+
pub const SA_NOCLDSTOP: ::c_uint = 0x00000001;
10+
pub const SA_NOCLDWAIT: ::c_uint = 0x00000002;
11+
pub const SA_NODEFER: ::c_uint = 0x40000000;
12+
pub const SA_ONSTACK: ::c_uint = 0x08000000;
13+
pub const SA_RESETHAND: ::c_uint = 0x80000000;
14+
pub const SA_RESTART: ::c_uint = 0x10000000;
15+
pub const SA_SIGINFO: ::c_uint = 0x00000004;
16+
817
s! {
918
pub struct sigaction {
1019
pub sa_flags: ::c_uint,

src/unix/notbsd/android/mod.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -157,11 +157,6 @@ pub const ECOMM: ::c_int = 70;
157157
pub const EPROTO: ::c_int = 71;
158158
pub const EDOTDOT: ::c_int = 73;
159159

160-
pub const SA_NODEFER: ::c_int = 0x40000000;
161-
pub const SA_RESETHAND: ::c_int = 0x80000000;
162-
pub const SA_RESTART: ::c_int = 0x10000000;
163-
pub const SA_NOCLDSTOP: ::c_int = 0x00000001;
164-
165160
pub const EPOLL_CLOEXEC: ::c_int = 0x80000;
166161

167162
pub const EFD_CLOEXEC: ::c_int = 0x80000;
@@ -253,9 +248,6 @@ pub const PTHREAD_MUTEX_DEFAULT: ::c_int = PTHREAD_MUTEX_NORMAL;
253248

254249
pub const FIOCLEX: ::c_int = 0x5451;
255250

256-
pub const SA_ONSTACK: ::c_ulong = 0x08000000;
257-
pub const SA_SIGINFO: ::c_ulong = 0x00000004;
258-
pub const SA_NOCLDWAIT: ::c_ulong = 0x00000002;
259251
pub const SIGCHLD: ::c_int = 17;
260252
pub const SIGBUS: ::c_int = 7;
261253
pub const SIGUSR1: ::c_int = 10;

0 commit comments

Comments
 (0)