Skip to content

Commit d281d1a

Browse files
committed
Merge pull request rust-lang#29 from alexcrichton/fix-sa-types
Touch up some SA_* constants
2 parents f0c68f3 + 4be5856 commit d281d1a

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/unix/notbsd/android/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ pub const FIOCLEX: ::c_ulong = 0x5451;
187187

188188
pub const SA_ONSTACK: ::c_ulong = 0x08000000;
189189
pub const SA_SIGINFO: ::c_ulong = 0x00000004;
190-
pub const SA_NOCLDWAIT: ::c_int = 0x00000002;
190+
pub const SA_NOCLDWAIT: ::c_ulong = 0x00000002;
191191

192192
pub const SIGCHLD: ::c_int = 17;
193193
pub const SIGBUS: ::c_int = 7;

src/unix/notbsd/linux/mips.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -227,9 +227,9 @@ pub const __SIZEOF_PTHREAD_MUTEXATTR_T: usize = 4;
227227
pub const FIOCLEX: ::c_ulong = 0x6601;
228228
pub const FIONBIO: ::c_ulong = 0x667e;
229229

230-
pub const SA_ONSTACK: ::c_ulong = 0x08000000;
231-
pub const SA_SIGINFO: ::c_ulong = 0x00000008;
232-
pub const SA_NOCLDWAIT: ::c_int = 0x00010000;
230+
pub const SA_ONSTACK: ::c_uint = 0x08000000;
231+
pub const SA_SIGINFO: ::c_uint = 0x00000008;
232+
pub const SA_NOCLDWAIT: ::c_uint = 0x00010000;
233233

234234
pub const SIGCHLD: ::c_int = 18;
235235
pub const SIGBUS: ::c_int = 10;

src/unix/notbsd/linux/notmips/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,8 @@ pub const TCP_TIMESTAMP: ::c_int = 24;
171171
pub const FIOCLEX: ::c_ulong = 0x5451;
172172
pub const FIONBIO: ::c_ulong = 0x5421;
173173

174-
pub const SA_ONSTACK: ::c_ulong = 0x08000000;
175-
pub const SA_SIGINFO: ::c_ulong = 0x00000004;
174+
pub const SA_ONSTACK: ::c_int = 0x08000000;
175+
pub const SA_SIGINFO: ::c_int = 0x00000004;
176176
pub const SA_NOCLDWAIT: ::c_int = 0x00000002;
177177

178178
pub const SIGCHLD: ::c_int = 17;

0 commit comments

Comments
 (0)