Use typedef for Windows ssize_t. Fixes #2144. #2145
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
|
json-c 0.17 uses in json_inttypes.h: #if defined(_MSC_VER)
#include <BaseTsd.h>
typedef SSIZE_T ssize_t;
#endifWhich expands to the same thing. Msys2 builds won't like that I'm guessing. |
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #2145 +/- ##
==========================================
- Coverage 76.98% 76.98% -0.01%
==========================================
Files 194 194
Lines 37074 37074
==========================================
- Hits 28542 28541 -1
- Misses 8532 8533 +1 ☔ View full report in Codecov by Sentry. |
|
Windows-native tests fail for some reason |
Is that perhaps related to what's going on #2139? |
Yeah, that must be the reason. I'm debugging that issue. |
moz-v2v-gh
pushed a commit
to mozilla/releases-comm-central
that referenced
this pull request
Nov 30, 2023
…kaie #define ssize_t conflicts with typedefs added in json-c 0.17. Replace the defines with typedefs, these result in the same typedefs used in json-c. Patch has been submitted upstream: rnpgp/rnp#2145 Differential Revision: https://phabricator.services.mozilla.com/D193100 --HG-- extra : moz-landing-system : lando
maxirmx
approved these changes
Dec 8, 2023
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.
Fixes #2144