deps: fix CLEAR_HASH macro to be usable as a single statement #11616
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
|
Maybe something like what we do for V8 (https://github.com/nodejs/node/blob/master/doc/guides/maintaining-V8.md#backporting-to-abandoned-branches)? |
sam-github
force-pushed
the
zlib-apply-macro-fix
branch
from
11488aa to
9fd5fac
Compare
|
OK, rewrote the commit a bit, its a bit different because zlib's commits don't have as much metadata in the commit message, and don't come from reviewed PRs (AFAICT). |
addaleax
approved these changes
Feb 28, 2017
jasnell
approved these changes
Feb 28, 2017
cjihrig
approved these changes
Mar 1, 2017
Apply unreleased (as of zlib v1.2.11) patch from upstream: - madler/zlib@38e8ce3 Original commit message: Fix CLEAR_HASH macro to be usable as a single statement. As it is used in deflateParams(). PR-URL: nodejs#11616 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
sam-github
force-pushed
the
zlib-apply-macro-fix
branch
from
9fd5fac to
fd17e8b
Compare
evanlucas
pushed a commit
that referenced
this pull request
Mar 7, 2017
Apply unreleased (as of zlib v1.2.11) patch from upstream: - madler/zlib@38e8ce3 Original commit message: Fix CLEAR_HASH macro to be usable as a single statement. As it is used in deflateParams(). PR-URL: #11616 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Merged
2 tasks
|
should backport on top of #10980 |
MylesBorins
pushed a commit
that referenced
this pull request
Mar 29, 2017
Apply unreleased (as of zlib v1.2.11) patch from upstream: - madler/zlib@38e8ce3 Original commit message: Fix CLEAR_HASH macro to be usable as a single statement. As it is used in deflateParams(). PR-URL: #11616 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
MylesBorins
pushed a commit
that referenced
this pull request
Mar 29, 2017
Apply unreleased (as of zlib v1.2.11) patch from upstream: - madler/zlib@38e8ce3 Original commit message: Fix CLEAR_HASH macro to be usable as a single statement. As it is used in deflateParams(). PR-URL: #11616 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
MylesBorins
pushed a commit
that referenced
this pull request
Mar 29, 2017
Apply unreleased (as of zlib v1.2.11) patch from upstream: - madler/zlib@38e8ce3 Original commit message: Fix CLEAR_HASH macro to be usable as a single statement. As it is used in deflateParams(). PR-URL: #11616 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
MylesBorins
pushed a commit
that referenced
this pull request
Mar 29, 2017
Apply unreleased (as of zlib v1.2.11) patch from upstream: - madler/zlib@38e8ce3 Original commit message: Fix CLEAR_HASH macro to be usable as a single statement. As it is used in deflateParams(). PR-URL: #11616 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
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.
As it is used in deflateParams().
Cherry-pick: madler/zlib@38e8ce3
Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passesAffected core subsystem(s)
deps, zlib
@bnoordhuis I'm not sure what the style is for landing upstream fixes, is this good enough? Or should it look like madler/zlib@38e8ce3?