diff options
| author | bors <bors@rust-lang.org> | 2021-03-17 01:29:18 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-03-17 01:29:18 +0000 |
| commit | 801487eca2101b57ef8489339593fe86e3197ec0 (patch) | |
| tree | 3cfd41c3fc05cb50ef0f47de4c6d725fea9cf572 | |
| parent | ecbb073a1d11c76427c8ec596f1ab6c6d997e827 (diff) | |
| parent | 49169ed604a397f318b60258124d531d131975f8 (diff) | |
| download | rust-libc-801487eca2101b57ef8489339593fe86e3197ec0.tar.gz | |
Auto merge of #2115 - zonyitoo:master, r=JohnTitor
Add SO_INCOMING_CPU for targets arm-unknown-linux-*
- fixes rust-lang/socket2#213
- ref shadowsocks/shadowsocks-rust#459
| -rw-r--r-- | src/unix/linux_like/linux/gnu/b32/arm/mod.rs | 1 | ||||
| -rw-r--r-- | src/unix/linux_like/linux/musl/b32/arm/mod.rs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/unix/linux_like/linux/gnu/b32/arm/mod.rs b/src/unix/linux_like/linux/gnu/b32/arm/mod.rs index 9e9a565d99..95c07168e5 100644 --- a/src/unix/linux_like/linux/gnu/b32/arm/mod.rs +++ b/src/unix/linux_like/linux/gnu/b32/arm/mod.rs @@ -325,6 +325,7 @@ pub const SO_PEERSEC: ::c_int = 31; pub const SO_SNDBUFFORCE: ::c_int = 32; pub const SO_RCVBUFFORCE: ::c_int = 33; pub const SO_PASSSEC: ::c_int = 34; +pub const SO_INCOMING_CPU: ::c_int = 49; pub const SA_SIGINFO: ::c_int = 0x00000004; pub const SA_NOCLDWAIT: ::c_int = 0x00000002; diff --git a/src/unix/linux_like/linux/musl/b32/arm/mod.rs b/src/unix/linux_like/linux/musl/b32/arm/mod.rs index 1f9bda4405..d05d03af25 100644 --- a/src/unix/linux_like/linux/musl/b32/arm/mod.rs +++ b/src/unix/linux_like/linux/musl/b32/arm/mod.rs @@ -383,6 +383,7 @@ pub const SO_RCVBUFFORCE: ::c_int = 33; pub const SO_PASSSEC: ::c_int = 34; pub const SO_PROTOCOL: ::c_int = 38; pub const SO_DOMAIN: ::c_int = 39; +pub const SO_INCOMING_CPU: ::c_int = 49; pub const SA_ONSTACK: ::c_int = 0x08000000; pub const SA_SIGINFO: ::c_int = 0x00000004; |