diff options
| author | bors <bors@rust-lang.org> | 2017-07-04 15:50:03 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-07-04 15:50:03 +0000 |
| commit | 44034f077754b9148b685ee441e43b57b7bf4a32 (patch) | |
| tree | 8d9ae5c0ae2e33896554b87c65a822377d244a82 | |
| parent | ce93306c01f6b48447af280e23fe7f05f1b67545 (diff) | |
| parent | 0ea2040f13e269dfd73b89a31b56b1f1d83f2c70 (diff) | |
| download | rust-libc-44034f077754b9148b685ee441e43b57b7bf4a32.tar.gz | |
Auto merge of #644 - roblabla:feature-missing-SO_PASSCRED-arm, r=alexcrichton
Add missing flags in glibc arm
Adds two missing flags that are defined everywhere except for arm-linux-gnueabi for some reason : SO_PASSCRED and SO_SNDBUFFORCE.
Also adds MAP_32BIT on x86_64-linux-android and i686-linux-android.
| -rw-r--r-- | src/unix/notbsd/android/b32/x86.rs | 2 | ||||
| -rw-r--r-- | src/unix/notbsd/android/b64/x86_64.rs | 2 | ||||
| -rw-r--r-- | src/unix/notbsd/linux/other/b32/arm.rs | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/src/unix/notbsd/android/b32/x86.rs b/src/unix/notbsd/android/b32/x86.rs index c4b8197de5..bbf78e35b4 100644 --- a/src/unix/notbsd/android/b32/x86.rs +++ b/src/unix/notbsd/android/b32/x86.rs @@ -4,3 +4,5 @@ pub type wchar_t = i32; pub const O_DIRECT: ::c_int = 0x4000; pub const O_DIRECTORY: ::c_int = 0x10000; pub const O_NOFOLLOW: ::c_int = 0x20000; + +pub const MAP_32BIT: ::c_int = 0x40; diff --git a/src/unix/notbsd/android/b64/x86_64.rs b/src/unix/notbsd/android/b64/x86_64.rs index 7e824ccce8..0cbff0a3c5 100644 --- a/src/unix/notbsd/android/b64/x86_64.rs +++ b/src/unix/notbsd/android/b64/x86_64.rs @@ -51,3 +51,5 @@ pub const SYS_gettid: ::c_long = 186; pub const SIGSTKSZ: ::size_t = 8192; pub const MINSIGSTKSZ: ::size_t = 2048; + +pub const MAP_32BIT: ::c_int = 0x40; diff --git a/src/unix/notbsd/linux/other/b32/arm.rs b/src/unix/notbsd/linux/other/b32/arm.rs index 830fcaac11..b78b10f3c1 100644 --- a/src/unix/notbsd/linux/other/b32/arm.rs +++ b/src/unix/notbsd/linux/other/b32/arm.rs @@ -81,11 +81,13 @@ pub const MAP_NORESERVE: ::c_int = 0x04000; pub const EDEADLOCK: ::c_int = 35; +pub const SO_PASSCRED: ::c_int = 16; pub const SO_PEERCRED: ::c_int = 17; pub const SO_RCVLOWAT: ::c_int = 18; pub const SO_SNDLOWAT: ::c_int = 19; pub const SO_RCVTIMEO: ::c_int = 20; pub const SO_SNDTIMEO: ::c_int = 21; +pub const SO_SNDBUFFORCE: ::c_int = 32; pub const FIOCLEX: ::c_ulong = 0x5451; pub const FIONBIO: ::c_ulong = 0x5421; |