Skip to content

Commit e2bbeed

Browse files
committed
Fix android SA_* constants
1 parent c2904a7 commit e2bbeed

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
@@ -231,6 +231,15 @@ cfg_if! {
231231
}
232232
}
233233

234+
// These constants must be of the same type of sigaction.sa_flags
235+
pub const SA_NOCLDSTOP: ::c_uint = 0x00000001;
236+
pub const SA_NOCLDWAIT: ::c_uint = 0x00000002;
237+
pub const SA_NODEFER: ::c_uint = 0x40000000;
238+
pub const SA_ONSTACK: ::c_uint = 0x08000000;
239+
pub const SA_RESETHAND: ::c_uint = 0x80000000;
240+
pub const SA_RESTART: ::c_uint = 0x10000000;
241+
pub const SA_SIGINFO: ::c_uint = 0x00000004;
242+
234243
pub const RTLD_GLOBAL: ::c_int = 0x00100;
235244
pub const RTLD_NOW: ::c_int = 2;
236245
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
@@ -560,11 +560,6 @@ pub const ECOMM: ::c_int = 70;
560560
pub const EPROTO: ::c_int = 71;
561561
pub const EDOTDOT: ::c_int = 73;
562562

563-
pub const SA_NODEFER: ::c_int = 0x40000000;
564-
pub const SA_RESETHAND: ::c_int = 0x80000000;
565-
pub const SA_RESTART: ::c_int = 0x10000000;
566-
pub const SA_NOCLDSTOP: ::c_int = 0x00000001;
567-
568563
pub const EPOLL_CLOEXEC: ::c_int = 0x80000;
569564
pub const EPOLLONESHOT: ::c_int = 0x40000000;
570565
pub const EPOLLRDHUP: ::c_int = 0x00002000;
@@ -745,9 +740,6 @@ pub const PTHREAD_MUTEX_DEFAULT: ::c_int = PTHREAD_MUTEX_NORMAL;
745740

746741
pub const FIOCLEX: ::c_int = 0x5451;
747742

748-
pub const SA_ONSTACK: ::c_ulong = 0x08000000;
749-
pub const SA_SIGINFO: ::c_ulong = 0x00000004;
750-
pub const SA_NOCLDWAIT: ::c_ulong = 0x00000002;
751743
pub const SIGCHLD: ::c_int = 17;
752744
pub const SIGBUS: ::c_int = 7;
753745
pub const SIGUSR1: ::c_int = 10;

0 commit comments

Comments
 (0)