diff options
| author | bors <bors@rust-lang.org> | 2021-03-19 09:13:24 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-03-19 09:13:24 +0000 |
| commit | ac935822f62625d08b33e2a56c20e6f24dc575ef (patch) | |
| tree | 2269dd4e919f85ed3d6eebc43a66258be77f99a0 | |
| parent | 9d710c1fe09d06215306fb3684b0b1628deafd9e (diff) | |
| parent | a045c096dadcd62e894322b98f32755a67d010a8 (diff) | |
| download | rust-libc-ac935822f62625d08b33e2a56c20e6f24dc575ef.tar.gz | |
Auto merge of #2119 - oherrala:64bit-musl-so-incoming-cpu, r=JohnTitor
Define SO_INCOMING_CPU for {aarch64,x86_64}-unknown-linux-musl
This continues where https://github.com/rust-lang/libc/pull/2115 left off and hopefully fixes `socket2` crate on these two targets.
| -rw-r--r-- | src/unix/linux_like/linux/musl/b64/aarch64/mod.rs | 1 | ||||
| -rw-r--r-- | src/unix/linux_like/linux/musl/b64/x86_64/mod.rs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/unix/linux_like/linux/musl/b64/aarch64/mod.rs b/src/unix/linux_like/linux/musl/b64/aarch64/mod.rs index 0a36809918..aa5ed67a1e 100644 --- a/src/unix/linux_like/linux/musl/b64/aarch64/mod.rs +++ b/src/unix/linux_like/linux/musl/b64/aarch64/mod.rs @@ -194,6 +194,7 @@ pub const SO_SNDBUFFORCE: ::c_int = 32; pub const SO_RCVBUFFORCE: ::c_int = 33; 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; diff --git a/src/unix/linux_like/linux/musl/b64/x86_64/mod.rs b/src/unix/linux_like/linux/musl/b64/x86_64/mod.rs index ad8691182f..b96954a783 100644 --- a/src/unix/linux_like/linux/musl/b64/x86_64/mod.rs +++ b/src/unix/linux_like/linux/musl/b64/x86_64/mod.rs @@ -827,6 +827,7 @@ pub const SO_SNDBUFFORCE: ::c_int = 32; pub const SO_RCVBUFFORCE: ::c_int = 33; pub const SO_PROTOCOL: ::c_int = 38; pub const SO_DOMAIN: ::c_int = 39; +pub const SO_INCOMING_CPU: ::c_int = 49; pub const MAP_ANON: ::c_int = 0x0020; pub const MAP_GROWSDOWN: ::c_int = 0x0100; |