diff options
| author | bors <bors@rust-lang.org> | 2019-05-27 19:14:42 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-05-27 19:14:42 +0000 |
| commit | 4e9c49e4d65fa5d2a70892d42958174ebe2b3200 (patch) | |
| tree | 91c4be155ff4ab32094d5849b1432e4679e6f179 | |
| parent | 1059e0bd85428728cdd8b1546ce4edbace81f725 (diff) | |
| parent | 45c84a07ab2585b45d870b50c3b91eef3a09a3c4 (diff) | |
| download | rust-libc-4e9c49e4d65fa5d2a70892d42958174ebe2b3200.tar.gz | |
Auto merge of #1370 - alesharik:master, r=gnzlbg
Fix SA_* constants for `sigaction` in Android
| -rw-r--r-- | src/unix/notbsd/android/b32/mod.rs | 14 | ||||
| -rw-r--r-- | src/unix/notbsd/android/b64/mod.rs | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/unix/notbsd/android/b32/mod.rs b/src/unix/notbsd/android/b32/mod.rs index 5a3e6447a9..1cc59676f9 100644 --- a/src/unix/notbsd/android/b32/mod.rs +++ b/src/unix/notbsd/android/b32/mod.rs @@ -162,13 +162,13 @@ s! { } // These constants must be of the same type of sigaction.sa_flags -pub const SA_NOCLDSTOP: ::c_ulong = 0x00000001; -pub const SA_NOCLDWAIT: ::c_ulong = 0x00000002; -pub const SA_NODEFER: ::c_ulong = 0x40000000; -pub const SA_ONSTACK: ::c_ulong = 0x08000000; -pub const SA_RESETHAND: ::c_ulong = 0x80000000; -pub const SA_RESTART: ::c_ulong = 0x10000000; -pub const SA_SIGINFO: ::c_ulong = 0x00000004; +pub const SA_NOCLDSTOP: ::c_int = 0x00000001; +pub const SA_NOCLDWAIT: ::c_int = 0x00000002; +pub const SA_NODEFER: ::c_int = 0x40000000; +pub const SA_ONSTACK: ::c_int = 0x08000000; +pub const SA_RESETHAND: ::c_int = 0x80000000; +pub const SA_RESTART: ::c_int = 0x10000000; +pub const SA_SIGINFO: ::c_int = 0x00000004; pub const RTLD_GLOBAL: ::c_int = 2; pub const RTLD_NOW: ::c_int = 0; diff --git a/src/unix/notbsd/android/b64/mod.rs b/src/unix/notbsd/android/b64/mod.rs index 19ebe0871b..2b69512b93 100644 --- a/src/unix/notbsd/android/b64/mod.rs +++ b/src/unix/notbsd/android/b64/mod.rs @@ -232,13 +232,13 @@ cfg_if! { } // These constants must be of the same type of sigaction.sa_flags -pub const SA_NOCLDSTOP: ::c_uint = 0x00000001; -pub const SA_NOCLDWAIT: ::c_uint = 0x00000002; -pub const SA_NODEFER: ::c_uint = 0x40000000; -pub const SA_ONSTACK: ::c_uint = 0x08000000; -pub const SA_RESETHAND: ::c_uint = 0x80000000; -pub const SA_RESTART: ::c_uint = 0x10000000; -pub const SA_SIGINFO: ::c_uint = 0x00000004; +pub const SA_NOCLDSTOP: ::c_int = 0x00000001; +pub const SA_NOCLDWAIT: ::c_int = 0x00000002; +pub const SA_NODEFER: ::c_int = 0x40000000; +pub const SA_ONSTACK: ::c_int = 0x08000000; +pub const SA_RESETHAND: ::c_int = 0x80000000; +pub const SA_RESTART: ::c_int = 0x10000000; +pub const SA_SIGINFO: ::c_int = 0x00000004; pub const RTLD_GLOBAL: ::c_int = 0x00100; pub const RTLD_NOW: ::c_int = 2; |