Rename UpdateResource due to conflict with Windows #6205
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
|
Can one of the admins verify this patch? |
mehrdadn
force-pushed
the
fix-update-resource-name-conflict
branch
from
2cd3f24
to
0175703
Compare
|
Test FAILed. |
edoakes
previously requested changes
Nov 20, 2019
|
Test PASSed. |
edoakes
approved these changes
Nov 20, 2019
|
Test PASSed. |
|
@edoakes I think this should be good to merge? (Doesn't seem the build failures are related.) |
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.
Why are these changes needed?
UpdateResourceis a predefined macro in Windows, so I renamed it to avoid the conflict.Related issue number
#631
Checks
scripts/format.shto lint the changes in this PR.