Skip to content

Commit 801487e

Browse files
committed
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
2 parents ecbb073 + 49169ed commit 801487e

File tree

2 files changed

+2
-0
lines changed
  • src/unix/linux_like/linux

2 files changed

+2
-0
lines changed

src/unix/linux_like/linux/gnu/b32/arm/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,7 @@ pub const SO_PEERSEC: ::c_int = 31;
325325
pub const SO_SNDBUFFORCE: ::c_int = 32;
326326
pub const SO_RCVBUFFORCE: ::c_int = 33;
327327
pub const SO_PASSSEC: ::c_int = 34;
328+
pub const SO_INCOMING_CPU: ::c_int = 49;
328329

329330
pub const SA_SIGINFO: ::c_int = 0x00000004;
330331
pub const SA_NOCLDWAIT: ::c_int = 0x00000002;

src/unix/linux_like/linux/musl/b32/arm/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,7 @@ pub const SO_RCVBUFFORCE: ::c_int = 33;
383383
pub const SO_PASSSEC: ::c_int = 34;
384384
pub const SO_PROTOCOL: ::c_int = 38;
385385
pub const SO_DOMAIN: ::c_int = 39;
386+
pub const SO_INCOMING_CPU: ::c_int = 49;
386387

387388
pub const SA_ONSTACK: ::c_int = 0x08000000;
388389
pub const SA_SIGINFO: ::c_int = 0x00000004;

0 commit comments

Comments
 (0)