[CF] Apply missing includes and cleanups. #2635
Merged
Conversation
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
|
@swift-ci test |
compnerd
reviewed
Jan 30, 2020
Here we apply a few cursory cleanups for porting purposes. These changes
are as follows:
* move a TARGET_OS_CYGWIN block: it was nested under TARGET_OS_MAC,
which is probably not intended.
* include sys/socket.h for TARGET_OS_BSD: which should be provided.
* include netinet/in.h for !TARGET_OS_WIN32: which is required for
struct sockaddr_in; from memory, this is included transitively on
Linux, but not elsewhere.
* use TARGET_OS_BSD instead of TARGET_OS_UNIX: TARGET_OS_UNIX appears
no longer used; TARGET_OS_BSD is a synonym for __unix__ anyway.
* disuse pthread_setname_np for TARGET_OS_BSD: this doesn't appear in
the FreeBSD manuals, it's not available on OpenBSD, so let's just
disuse it.
3405691582
force-pushed
the
CFSocket_Rehab
branch
from
efe22b6 to
24b7396
Compare
|
@swift-ci test |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Here we apply a few cursory cleanups for porting purposes. These changes
are as follows:
move a TARGET_OS_CYGWIN block: it was nested under TARGET_OS_MAC,
which is probably not intended.
include sys/socket.h for TARGET_OS_BSD: which should be provided.
include netinet/in.h for !TARGET_OS_WIN32: which is required for
struct sockaddr_in; from memory, this is included transitively on
Linux, but not elsewhere.
use TARGET_OS_BSD instead of TARGET_OS_UNIX: TARGET_OS_UNIX appears
no longer used; TARGET_OS_BSD is a synonym for unix anyway.
disuse pthread_setname_np for TARGET_OS_BSD: this doesn't appear in
the FreeBSD manuals, it's not available on OpenBSD, so let's just
disuse it.