Skip to content

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

Merged
sam-github merged 1 commit into
nodejs:masterfrom
sam-github:zlib-apply-macro-fix
Mar 6, 2017
Merged

deps: fix CLEAR_HASH macro to be usable as a single statement#11616
sam-github merged 1 commit into
nodejs:masterfrom
sam-github:zlib-apply-macro-fix

Conversation

@sam-github

Copy link
Copy Markdown
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-githubsam-github added the zlib Issues and PRs related to the zlib subsystem. label Feb 28, 2017
@addaleax

Copy link
Copy Markdown
Member

@sam-github

Copy link
Copy Markdown
ContributorAuthor

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-botnodejs-github-bot added the zlib Issues and PRs related to the zlib subsystem. label Feb 28, 2017
@addaleax

Copy link
Copy Markdown
Member

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
sam-githubforce-pushed the zlib-apply-macro-fix branch from 9fd5fac to fd17e8bCompareMarch 6, 2017 17:37
@sam-github
sam-github merged commit fd17e8b into nodejs:masterMar 6, 2017
@sam-github
sam-github deleted the zlib-apply-macro-fix branch March 6, 2017 17:39
@sam-github

Copy link
Copy Markdown
ContributorAuthor

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 <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
@evanlucasevanlucas mentioned this pull request Mar 8, 2017
@sam-githubsam-github mentioned this pull request Mar 10, 2017
2 tasks
@sam-github

Copy link
Copy Markdown
ContributorAuthor

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>
This was referenced Mar 29, 2017
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

zlibIssues and PRs related to the zlib subsystem.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@sam-github@addaleax@jasnell@cjihrig@nodejs-github-bot