-
Notifications
You must be signed in to change notification settings - Fork 296
Split target_os = "nto" cfg by env so io-sock variants use TCP_KEEPIDLE #654
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
+2
−2
Merged
Changes from 1 commit
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -298,11 +298,17 @@ pub(crate) use libc::{TCP_KEEPCNT, TCP_KEEPINTVL}; | |
| // See this type in the Windows file. | ||
| pub(crate) type Bool = c_int; | ||
|
|
||
| // QNX legacy io-pkt stack (nto70, nto71) exposes TCP_KEEPALIVE. | ||
| // The newer io-sock stack (nto71_iosock, nto80) replaced it with the | ||
| // BSD-style TCP_KEEPIDLE — handle both branches below. | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is not a great place for this comment. Either move it below or just remove it.
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think we can just remove it. |
||
| #[cfg(any( | ||
| target_os = "ios", | ||
| target_os = "visionos", | ||
| target_os = "macos", | ||
| target_os = "nto", | ||
| all( | ||
| target_os = "nto", | ||
| any(target_env = "nto70", target_env = "nto71"), | ||
| ), | ||
| target_os = "tvos", | ||
| target_os = "watchos", | ||
| ))] | ||
|
|
@@ -312,7 +318,10 @@ use libc::TCP_KEEPALIVE as KEEPALIVE_TIME; | |
| target_os = "ios", | ||
| target_os = "visionos", | ||
| target_os = "macos", | ||
| target_os = "nto", | ||
| all( | ||
| target_os = "nto", | ||
| any(target_env = "nto70", target_env = "nto71"), | ||
| ), | ||
| target_os = "openbsd", | ||
| target_os = "tvos", | ||
| target_os = "watchos", | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could we add the new QNX versions to CI so we actually build this stuff?
socket2/.github/workflows/main.yml
Lines 67 to 111 in 602e784