Adding the correct value for __swift_mode_t in Android. #14636
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
approved these changes
Feb 14, 2018
stdlib/public/SwiftShims/LibcShims.h
Outdated
| #if defined(__linux__) | ||
| #if defined(__ANDROID__) | ||
| typedef __swift_uint16_t __swift_mode_t; | ||
| #elif defined(__linux__) |
There was a problem hiding this comment.
This feels a bit fragile to me. This may seem stylistic and silly, but, I feel that if someone were to accidentally reorder the items, this would break. Writing it as the following would make that more visible:
#if defined(__linux__)
# if defined(__ANDROID__)
typedef __swift_uint16_t __swift_mode_t;
# else
typedef __swift_uint32_t __swift_mode_t;
# endif
#else
There was a problem hiding this comment.
absolutely, doing that change now! I'll keep this mind for the next changes.
There was a problem hiding this comment.
@compnerd got it, done. I'll put a note to do a cleanup PR later fixes all the other occurrences (or as much as possible w/o breaking anything :) )
gonzalolarralde
force-pushed
the
libcshims-android-swift-mode-t
branch
from
b4a1227 to
ffc4228
Compare
As defined(__linux__) also matches, this never gets to the final else case.
gonzalolarralde
force-pushed
the
libcshims-android-swift-mode-t
branch
from
ffc4228 to
fb08fb8
Compare
|
@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.
As
defined(__linux__)also matches, this never gets to the finalelsecase. The lack of this line is causing the following static assert to fail.