patch0: Avoid multiple definitions of the verbose variable #51
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
This makes gcc 11.2.0 on Ubuntu 22.04 to fail the build as a result of multiple definitions of this variable. We now define it once in unsquashfs.c and extern it in error.h header file.
TannerFilip
reviewed
Dec 4, 2022
| @@ -38724,3 +38728,2821 @@ diff --strip-trailing-cr -NBbaur squashfs-tools/unsquashfs.c squashfs-tools-patc | |||
| ERROR("\nDecompressors available:\n"); | |||
| display_compressors("", ""); | |||
| } | |||
| diff --color --strip-trailing-cr -NBbaur squashfs-tools/unsquashfs.c.orig squashfs-tools-patched/unsquashfs.c.orig | |||
There was a problem hiding this comment.
I'm guessing this isn't all supposed to be here? Otherwise this worked fine for me.
This was referenced Feb 16, 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.
This makes gcc 11.2.0 on Ubuntu 22.04 to fail the build as a result of
multiple definitions of this variable.
We now define it once in unsquashfs.c and extern it in error.h header file.