MSVC compatibility for vcpkg #266
Merged
Conversation
This file contains 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
…(rare) This prevents a bug class where we bswap things when __LITTLE_ENDIAN__ is not defined. Almost all modern systems are little endian, so detecting __BIG_ENDIAN__ is a better strategy.
nikias
reviewed
Nov 28, 2024
| @@ -343,7 +389,7 @@ static char *plist_utf16be_to_utf8(uint16_t *unistr, long len, long *items_read, | |||
| } | |||
|
|
|||
| while (i < len) { | |||
| wc = be16toh(get_unaligned(unistr + i)); | |||
| wc = UINT_TO_HOST(unistr + i, sizeof(wc)); | |||
There was a problem hiding this comment.
Getting this:
bplist.c:392:18: warning: pointer type mismatch ('const char *' and 'uint16_t *' (aka 'unsigned short *')) [-Wpointer-type-mismatch]
wc = (uint16_t)UINT_TO_HOST(unistr + i, sizeof(wc));
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
bplist.c:190:24: note: expanded from macro 'UINT_TO_HOST'
__up.src = ((n) > 8) ? (const char*)(x) + ((n) - 8) : (x); \
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~
1 warning generated.```
nikias
reviewed
Nov 28, 2024
src/bplist.c
Outdated
| #define UINT_TO_HOST(x, n) \ | ||
| ({ \ | ||
| union plist_uint_ptr __up; \ | ||
| __up.src = ((n) > 8) ? (x) + ((n) - 8) : (x); \ | ||
| __up.src = ((n) > 8) ? (const char*)(x) + ((n) - 8) : (x); \ |
There was a problem hiding this comment.
See comment below. I think we need another cast, like this:
__up.src = ((n) > 8) ? (const char*)(x) + ((n) - 8) : (const char*)(x);
And maybe in the _MSC_VER variant too.
There was a problem hiding this comment.
it does pass all checks though when I remove the cast you put there.
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.
Closes #76