Fix patch 03_headers_order.#97
Merged
stephanemagnenat merged 1 commit intoGlobulation2:masterfrom Apr 14, 2024
Merged
Conversation
In PR Globulation2#78, "snprintf & friends", I changed an #ifdef near the line that was moved in patch Globulation2#3. That change fixes an error with Visual Studio 2015 and later, but caused the patch to fail to apply in GitHub Actions PR Globulation2#77.
Quipyowert2
force-pushed
the
update-patch3
branch
from
f803308 to
b5cc787
Compare
Contributor
|
Is that still relevant? Or could we bring the fix in the patch to upstream? |
Contributor
Author
|
Yes it's still relevant. The original patch file won't apply anymore since I changed that context line in PR #78. So we should probably let Debian know of this change. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
In PR #78, "snprintf & friends", I changed an #ifdef near the line that was moved in patch
#3. That change fixes an error with Visual Studio 2015 and later, but caused the patch to fail to apply in GitHub Actions PR #77.Edit: Oops, I meant PR #78, not
#96.