[CF] OpenBSD doesn't have the xlocale header. #2609
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 15, 2020
| @@ -97,9 +97,9 @@ CF_EXTERN_C_BEGIN | |||
|
|
|||
| #if TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD | |||
|
|
|||
| #if !TARGET_OS_CYGWIN && !defined(__linux__) | |||
| #if !TARGET_OS_CYGWIN && !defined(__linux__) && !defined(__OpenBSD__) | |||
There was a problem hiding this comment.
Not related to your change, but this is confusing. I assume that the condition in conjunction with L98 means that this is for Android, macOS, and *BSD but not OpenBSD. Would you mind rewriting this as such: #if defined(ANDROID) || (TARGET_OS_BSD && !defined(__OpenBSD__)) || TARGET_OS_MAC
There was a problem hiding this comment.
Done. (Used TARGET_OS_ANDROID instead of defined(ANDROID) and reordered the clauses.)
OpenBSD is one of the platforms that doesn't have xlocale.h, so ensure that the header is not used and the relevant macros are exposed. While we are here, change the sense of the conditionals in CFInternal.h to be a little more clear and consistent.
3405691582
force-pushed
the
CFInternal_NoXlocaleOnOpenBSD
branch
from
d1820fa to
6ca0868
Compare
compnerd
approved these changes
Jan 15, 2020
|
@swift-ci please 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.
OpenBSD is one of the platforms that doesn't have xlocale.h, so ensure
that the header is not used and the relevant macros are exposed.