Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deps: fix CLEAR_HASH macro to be usable as a single statement #11616

Merged
merged 1 commit into from
Mar 6, 2017

Conversation

sam-github
Copy link
Contributor

As it is used in deflateParams().

Cherry-pick: madler/zlib@38e8ce3

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • [?] commit message follows commit guidelines
Affected 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?

@sam-github sam-github added the zlib Issues and PRs related to the zlib subsystem. label Feb 28, 2017
@addaleax
Copy link
Member

@sam-github
Copy link
Contributor Author

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).

@nodejs-github-bot nodejs-github-bot added the zlib Issues and PRs related to the zlib subsystem. label Feb 28, 2017
@addaleax
Copy link
Member

addaleax commented Mar 5, 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 <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
@sam-github sam-github merged commit fd17e8b into nodejs:master Mar 6, 2017
@sam-github sam-github deleted the zlib-apply-macro-fix branch March 6, 2017 17:39
@sam-github
Copy link
Contributor Author

FYI: madler/zlib@38e8ce3#commitcomment-21171777

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 <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
@evanlucas evanlucas mentioned this pull request Mar 8, 2017
@sam-github sam-github mentioned this pull request Mar 10, 2017
2 tasks
@sam-github
Copy link
Contributor Author

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 <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
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 <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
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 <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
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 <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
This was referenced Mar 29, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
zlib Issues and PRs related to the zlib subsystem.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants