Skip to content

Commit 74c4c79

Browse files
committed
Fix android SA_* constants
1 parent 05a2d19 commit 74c4c79

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
@@ -129,6 +129,15 @@ s! {
129129
}
130130
}
131131

132+
// These constants must be of the same type of sigaction.sa_flags
133+
pub const SA_NOCLDSTOP: ::c_ulong = 0x00000001;
134+
pub const SA_NOCLDWAIT: ::c_ulong = 0x00000002;
135+
pub const SA_NODEFER: ::c_ulong = 0x40000000;
136+
pub const SA_ONSTACK: ::c_ulong = 0x08000000;
137+
pub const SA_RESETHAND: ::c_ulong = 0x80000000;
138+
pub const SA_RESTART: ::c_ulong = 0x10000000;
139+
pub const SA_SIGINFO: ::c_ulong = 0x00000004;
140+
132141
pub const RTLD_GLOBAL: ::c_int = 2;
133142
pub const RTLD_NOW: ::c_int = 0;
134143
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
@@ -143,6 +143,15 @@ s! {
143143
}
144144
}
145145

146+
// These constants must be of the same type of sigaction.sa_flags
147+
pub const SA_NOCLDSTOP: ::c_uint = 0x00000001;
148+
pub const SA_NOCLDWAIT: ::c_uint = 0x00000002;
149+
pub const SA_NODEFER: ::c_uint = 0x40000000;
150+
pub const SA_ONSTACK: ::c_uint = 0x08000000;
151+
pub const SA_RESETHAND: ::c_uint = 0x80000000;
152+
pub const SA_RESTART: ::c_uint = 0x10000000;
153+
pub const SA_SIGINFO: ::c_uint = 0x00000004;
154+
146155
pub const O_DIRECT: ::c_int = 0x10000;
147156
pub const O_DIRECTORY: ::c_int = 0x4000;
148157
pub const O_NOFOLLOW: ::c_int = 0x8000;

src/unix/notbsd/android/mod.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -166,11 +166,6 @@ pub const ECOMM: ::c_int = 70;
166166
pub const EPROTO: ::c_int = 71;
167167
pub const EDOTDOT: ::c_int = 73;
168168

169-
pub const SA_NODEFER: ::c_int = 0x40000000;
170-
pub const SA_RESETHAND: ::c_int = 0x80000000;
171-
pub const SA_RESTART: ::c_int = 0x10000000;
172-
pub const SA_NOCLDSTOP: ::c_int = 0x00000001;
173-
174169
pub const EPOLL_CLOEXEC: ::c_int = 0x80000;
175170

176171
pub const EFD_CLOEXEC: ::c_int = 0x80000;
@@ -262,9 +257,6 @@ pub const PTHREAD_MUTEX_DEFAULT: ::c_int = PTHREAD_MUTEX_NORMAL;
262257

263258
pub const FIOCLEX: ::c_int = 0x5451;
264259

265-
pub const SA_ONSTACK: ::c_ulong = 0x08000000;
266-
pub const SA_SIGINFO: ::c_ulong = 0x00000004;
267-
pub const SA_NOCLDWAIT: ::c_ulong = 0x00000002;
268260
pub const SIGCHLD: ::c_int = 17;
269261
pub const SIGBUS: ::c_int = 7;
270262
pub const SIGUSR1: ::c_int = 10;

0 commit comments

Comments
 (0)