Skip to content

Conversation

Meziu
Copy link
Contributor

@Meziu Meziu commented Jan 8, 2024

Simple #[cfg] fix to avoid using libc::SOMAXCONN, which isn't defined for the armv6k-nintendo-3ds target.

Edit: This is similar to #119632.

@rustbot
Copy link
Collaborator

rustbot commented Jan 8, 2024

r? @Mark-Simulacrum

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added O-unix Operating system: Unix-like S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Jan 8, 2024
@bors
Copy link
Collaborator

bors commented Jan 9, 2024

☔ The latest upstream changes (presumably #119760) made this pull request unmergeable. Please resolve the merge conflicts.

@Meziu Meziu force-pushed the armv6k-nintendo-3ds branch from 52a3bc8 to 7a7bb3e Compare January 9, 2024 11:21
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jan 14, 2024

📌 Commit 7a7bb3e has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 14, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 14, 2024
…llaumeGomez

Rollup of 3 pull requests

Successful merges:

 - rust-lang#119561 (rustdoc: rename `issue-\d+.rs` tests to have meaningful names (part 5))
 - rust-lang#119742 (ARMv6K HorizonOS - Fix backlog for UnixListener)
 - rust-lang#119960 (Inline 2 functions that appear in dep-graph profiles.)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit e401754 into rust-lang:master Jan 14, 2024
@rustbot rustbot added this to the 1.77.0 milestone Jan 14, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jan 14, 2024
Rollup merge of rust-lang#119742 - Meziu:armv6k-nintendo-3ds, r=Mark-Simulacrum

ARMv6K HorizonOS - Fix backlog for UnixListener

Simple `#[cfg]` fix to avoid using `libc::SOMAXCONN`, which isn't defined for the `armv6k-nintendo-3ds` target.

Edit: This is similar to rust-lang#119632.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
O-unix Operating system: Unix-like S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants