Platform: make MSVCRT more Unix-libc like #21293
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
|
CC: @jrose-apple |
|
@swift-ci please test |
|
I realized that I can play some indirection tricks and reduce the amount of code that needs to be effectively "if-defed", and this also makes user code be similar across platforms, so I think that this is an improvement. |
moiseev
reviewed
Dec 13, 2018
stdlib/public/Platform/msvcrt.swift
Outdated
| // Unfortunately, the clang importer does not import "complex" macros such as | ||
| // the one that are used in the UCRT for defining `stdin`, `stdout`, `stderr`. | ||
| // Replicate them manually. | ||
| public var stdin: UnsafeMutablePointer<FILE> { return __acrt_iob_func(0) } |
There was a problem hiding this comment.
These variables are already defined in Platform.swift under a guard. Wouldn't it be better to have them in the same place?
There was a problem hiding this comment.
sigh I had forgotten about that. Thanks! Yes, these belong there.
Since `stdin`, `stdout`, and `stderr` are defined via macros, we cannot see them on the swift side. Replicate these by hand. Expose `STDIN_FILENO`, `STDOUT_FILENO`, and `STDERR_FILENO` for compatibility with other libc implementations. This reduces the need for changing the codebase unnecessarily for MSVCRT.
compnerd
force-pushed
the
msvcrt-fileio
branch
from
09f299d to
04a5d84
Compare
|
@swift-ci please test |
|
Build failed |
|
Build failed |
moiseev
approved these changes
Dec 14, 2018
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.
Since
stdin,stdout, andstderrare defined via macros, we cannot see themon the swift side. Replicate these by hand. Expose
STDIN_FILENO,STDOUT_FILENO, andSTDERR_FILENOfor compatibility with other libcimplementations. This reduces the need for changing the codebase unnecessarily
for MSVCRT.
Replace this paragraph with a description of your changes and rationale. Provide links to external references/discussions if appropriate.
Resolves SR-NNNN.