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.

Sign up for GitHub

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

Jump to bottom

[v6.x backport] src: do not include x.h if x-inl.h is included #16610

Closed
wants to merge 3 commits into from
Closed

[v6.x backport] src: do not include x.h if x-inl.h is included #16610

wants to merge 3 commits into from

Conversation

joyeecheung
Copy link
Member

@joyeecheung joyeecheung commented Oct 30, 2017 •
edited
Loading

Refs: #16518
Refs: #16548

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • documentation is changed or added
  • commit message follows commit guidelines
Affected core subsystem(s)

src, doc

@joyeecheung
src: make header file self-contained
b1e4d3c 
Make node_crypto_clienthello-inl.h self-contained.

PR-URL: nodejs#16518
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
@joyeecheung
src: do not include x.h if x-inl.h is included
87a379c 
Fixes: nodejs#16519
PR-URL: nodejs#16548
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: Gireesh Punathil <[email protected]>
Reviewed-By: Daniel Bevenius <[email protected]>
Reviewed-By: Gibson Fahnestock <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
@nodejs-github-bot nodejs-github-bot added c++ Issues and PRs that require attention from people who are familiar with C++. lib / src Issues and PRs related to general changes in the lib or src directory. v6.x labels Oct 30, 2017
@joyeecheung
Copy link
Member Author

Skipped the doc changes because they depends on a bunch of other changes on CONTRIBUTING.md that are not backported. I think we don't really need to backport those to v6.x anyway. CI: https://ci.nodejs.org/job/node-test-pull-request/11089/

@joyeecheung
Copy link
Member Author

This should be landed with #16639, will update this PR later.

This was referenced Nov 14, 2017
Closed
Closed
@MylesBorins
Copy link
Contributor

@joyeecheung please let me know when this is updated

@joyeecheung
src: fix etw provider include on Windows
00bd0c8 
PR-URL: nodejs#16639
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: James M Snell <[email protected]>
@joyeecheung
Copy link
Member Author

@MylesBorins updated. Also I think I have an idea about #16639 (comment) now..probably need to add a comment there.

CI: https://ci.nodejs.org/job/node-test-pull-request/11440/

@joyeecheung
Copy link
Member Author

joyeecheung commented Nov 15, 2017 •
edited
Loading

Looks like the pis are down again..also the checks on this page are showing the build status before the update. Will need to relaunch CI later.

@joyeecheung
Copy link
Member Author

New CI: https://ci.nodejs.org/job/node-test-pull-request/11476/

MylesBorins pushed a commit that referenced this pull request Nov 16, 2017
@joyeecheung @MylesBorins
src: make header file self-contained
13d42d8 
Make node_crypto_clienthello-inl.h self-contained.

Backport-PR-URL: #16610
PR-URL: #16518
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
MylesBorins pushed a commit that referenced this pull request Nov 16, 2017
@joyeecheung @MylesBorins
src: do not include x.h if x-inl.h is included
f20bf69 
Backport-PR-URL: #16610
Fixes: #16519
PR-URL: #16548
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: Gireesh Punathil <[email protected]>
Reviewed-By: Daniel Bevenius <[email protected]>
Reviewed-By: Gibson Fahnestock <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
MylesBorins pushed a commit that referenced this pull request Nov 16, 2017
@joyeecheung @MylesBorins
src: fix etw provider include on Windows
c8cf488 
Backport-PR-URL: #16610
PR-URL: #16639
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: James M Snell <[email protected]>
@MylesBorins
Copy link
Contributor

landed in 04ea78d...c8cf488

MylesBorins pushed a commit that referenced this pull request Nov 21, 2017
@joyeecheung @MylesBorins
src: make header file self-contained
13eb5d9 
Make node_crypto_clienthello-inl.h self-contained.

Backport-PR-URL: #16610
PR-URL: #16518
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
MylesBorins pushed a commit that referenced this pull request Nov 21, 2017
@joyeecheung @MylesBorins
src: do not include x.h if x-inl.h is included
9b736f9 
Backport-PR-URL: #16610
Fixes: #16519
PR-URL: #16548
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: Gireesh Punathil <[email protected]>
Reviewed-By: Daniel Bevenius <[email protected]>
Reviewed-By: Gibson Fahnestock <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
MylesBorins pushed a commit that referenced this pull request Nov 21, 2017
@joyeecheung @MylesBorins
src: fix etw provider include on Windows
b5a4717 
Backport-PR-URL: #16610
PR-URL: #16639
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: James M Snell <[email protected]>
MylesBorins pushed a commit that referenced this pull request Nov 28, 2017
@joyeecheung @MylesBorins
src: make header file self-contained
a4688b0 
Make node_crypto_clienthello-inl.h self-contained.

Backport-PR-URL: #16610
PR-URL: #16518
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
MylesBorins pushed a commit that referenced this pull request Nov 28, 2017
@joyeecheung @MylesBorins
src: do not include x.h if x-inl.h is included
b00ced5 
Backport-PR-URL: #16610
Fixes: #16519
PR-URL: #16548
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: Gireesh Punathil <[email protected]>
Reviewed-By: Daniel Bevenius <[email protected]>
Reviewed-By: Gibson Fahnestock <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
MylesBorins pushed a commit that referenced this pull request Nov 28, 2017
@joyeecheung @MylesBorins
src: fix etw provider include on Windows
42cb64e 
Backport-PR-URL: #16610
PR-URL: #16639
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
c++ Issues and PRs that require attention from people who are familiar with C++. lib / src Issues and PRs related to general changes in the lib or src directory.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@joyeecheung @MylesBorins @nodejs-github-bot