Skip to content

Commit 4e9c49e

Browse files
committed
Auto merge of #1370 - alesharik:master, r=gnzlbg
Fix SA_* constants for `sigaction` in Android
2 parents 1059e0b + 45c84a0 commit 4e9c49e

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -162,13 +162,13 @@ s! {
162162
}
163163

164164
// 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;
165+
pub const SA_NOCLDSTOP: ::c_int = 0x00000001;
166+
pub const SA_NOCLDWAIT: ::c_int = 0x00000002;
167+
pub const SA_NODEFER: ::c_int = 0x40000000;
168+
pub const SA_ONSTACK: ::c_int = 0x08000000;
169+
pub const SA_RESETHAND: ::c_int = 0x80000000;
170+
pub const SA_RESTART: ::c_int = 0x10000000;
171+
pub const SA_SIGINFO: ::c_int = 0x00000004;
172172

173173
pub const RTLD_GLOBAL: ::c_int = 2;
174174
pub const RTLD_NOW: ::c_int = 0;

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -232,13 +232,13 @@ cfg_if! {
232232
}
233233

234234
// 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;
235+
pub const SA_NOCLDSTOP: ::c_int = 0x00000001;
236+
pub const SA_NOCLDWAIT: ::c_int = 0x00000002;
237+
pub const SA_NODEFER: ::c_int = 0x40000000;
238+
pub const SA_ONSTACK: ::c_int = 0x08000000;
239+
pub const SA_RESETHAND: ::c_int = 0x80000000;
240+
pub const SA_RESTART: ::c_int = 0x10000000;
241+
pub const SA_SIGINFO: ::c_int = 0x00000004;
242242

243243
pub const RTLD_GLOBAL: ::c_int = 0x00100;
244244
pub const RTLD_NOW: ::c_int = 2;

0 commit comments

Comments
 (0)