[v8.x backport] src: do not include x.h if x-inl.h is included #16609
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
nodejs-github-bot
added
c++
|
This is a pre-backport considering the amount of churn this could bring. |
joyeecheung
force-pushed
the
backport-16548-to-v8.x
branch
from
86be7d8
to
fd4d8dd
Compare
|
Forgot that this depends on #16518 ...new CI: https://ci.nodejs.org/job/node-test-pull-request/11088/ |
gibfahn
force-pushed
the
v8.x-staging
branch
5 times, most recently
from
b183192
to
fc8acc8
Compare
|
Thanks for doing this, but this (somehow) cherry-picked cleanly in 13c03ff and fc8acc8. Could you take a look at 13c03ff ? It seems to have some differences from b20ad2a, and it'd be good to know whether that's an issue, and if so whether we should revert the one in v8.x-staging, and use the one in this PR. |
|
So this needs #16639 bundled in then it should be good to go right? |
|
@gibfahn Yes, I'll do a rebase |
Fixes: nodejs#16519 PR-URL: nodejs#16548 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com> Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
PR-URL: nodejs#16548 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com> Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
PR-URL: nodejs#16639 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com>
joyeecheung
force-pushed
the
backport-16548-to-v8.x
branch
from
fd4d8dd
to
d735be9
Compare
|
@joyeecheung should this be backported to v6.x as well? |
gibfahn
pushed a commit
that referenced
this pull request
Nov 14, 2017
Fixes: #16519 PR-URL: #16548 Backport-PR-URL: #16609 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com> Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
|
@MylesBorins v6.x backport is at #16610 |
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.
Refs: #16548
Refs: #16518
Refs: #16639
Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passesAffected core subsystem(s)
src, doc