[shims] Fix Windows errno() and _stdlib_open #13235
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
compnerd
reviewed
Dec 3, 2017
stdlib/public/stubs/LibcShims.cpp
Outdated
| @@ -183,6 +183,9 @@ char * _Nullable *swift::_stdlib_getEnviron() { | |||
| } | |||
| #endif | |||
|
|
|||
| // not Windows | |||
| #endif | |||
There was a problem hiding this comment.
I realize that this is not your fault, but, while you are here, can you change this please? This should use the following form rather than the preceding // not windows.
#endif // defined(_WIN32) && !defined(__CYGWIN__)
There was a problem hiding this comment.
Sure. I've added a comment there. I also thought it made more sense inverted:
// !(defined(_WIN32) && !defined(__CYGWIN__))
since the #endif is actually the end of the #else block, but if you object to that I'll change it to what you originally had.
|
@swift-ci please test |
|
@swift-ci please test and merge |
1 similar comment
|
@swift-ci please test and merge |
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.
_stdlib_getErrno(),_stdlib_setErrno(), and_stdlib_openwere failing to compile for Windows.To address this, correctly define
__swift_mode_ton Windows and remove the platform-specific exclusion oferrno.hsince the Windows 10 SDK provides it.