Skip to content

Commit 6157e22

Browse files
committed
Fix android SA_* constants
1 parent 5cc0066 commit 6157e22

File tree

3 files changed

+18
-8
lines changed

3 files changed

+18
-8
lines changed

src/unix/notbsd/android/b32/mod.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,15 @@ s! {
161161
}
162162
}
163163

164+
// These constants must be of the same type of sigaction.sa_flags
165+
pub const SA_NOCLDSTOP: ::c_ulong = 0x00000001;
166+
pub const SA_NOCLDWAIT: ::c_ulong = 0x00000002;
167+
pub const SA_NODEFER: ::c_ulong = 0x40000000;
168+
pub const SA_ONSTACK: ::c_ulong = 0x08000000;
169+
pub const SA_RESETHAND: ::c_ulong = 0x80000000;
170+
pub const SA_RESTART: ::c_ulong = 0x10000000;
171+
pub const SA_SIGINFO: ::c_ulong = 0x00000004;
172+
164173
pub const RTLD_GLOBAL: ::c_int = 2;
165174
pub const RTLD_NOW: ::c_int = 0;
166175
pub const RTLD_DEFAULT: *mut ::c_void = -1isize as *mut ::c_void;

src/unix/notbsd/android/b64/mod.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,15 @@ s! {
126126
}
127127
}
128128

129+
// These constants must be of the same type of sigaction.sa_flags
130+
pub const SA_NOCLDSTOP: ::c_uint = 0x00000001;
131+
pub const SA_NOCLDWAIT: ::c_uint = 0x00000002;
132+
pub const SA_NODEFER: ::c_uint = 0x40000000;
133+
pub const SA_ONSTACK: ::c_uint = 0x08000000;
134+
pub const SA_RESETHAND: ::c_uint = 0x80000000;
135+
pub const SA_RESTART: ::c_uint = 0x10000000;
136+
pub const SA_SIGINFO: ::c_uint = 0x00000004;
137+
129138
pub const RTLD_GLOBAL: ::c_int = 0x00100;
130139
pub const RTLD_NOW: ::c_int = 2;
131140
pub const RTLD_DEFAULT: *mut ::c_void = 0i64 as *mut ::c_void;

src/unix/notbsd/android/mod.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -260,11 +260,6 @@ pub const ECOMM: ::c_int = 70;
260260
pub const EPROTO: ::c_int = 71;
261261
pub const EDOTDOT: ::c_int = 73;
262262

263-
pub const SA_NODEFER: ::c_int = 0x40000000;
264-
pub const SA_RESETHAND: ::c_int = 0x80000000;
265-
pub const SA_RESTART: ::c_int = 0x10000000;
266-
pub const SA_NOCLDSTOP: ::c_int = 0x00000001;
267-
268263
pub const EPOLL_CLOEXEC: ::c_int = 0x80000;
269264
pub const EPOLLONESHOT: ::c_int = 0x40000000;
270265
pub const EPOLLRDHUP: ::c_int = 0x00002000;
@@ -445,9 +440,6 @@ pub const PTHREAD_MUTEX_DEFAULT: ::c_int = PTHREAD_MUTEX_NORMAL;
445440

446441
pub const FIOCLEX: ::c_int = 0x5451;
447442

448-
pub const SA_ONSTACK: ::c_ulong = 0x08000000;
449-
pub const SA_SIGINFO: ::c_ulong = 0x00000004;
450-
pub const SA_NOCLDWAIT: ::c_ulong = 0x00000002;
451443
pub const SIGCHLD: ::c_int = 17;
452444
pub const SIGBUS: ::c_int = 7;
453445
pub const SIGUSR1: ::c_int = 10;

0 commit comments

Comments
 (0)