Skip to content

src: Fix extra includes of "env.h" and "env-inl.h" in this directory. #32293

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

Closed
nkreeger wants to merge 3 commits into from
+6 −6
Closed

src: Fix extra includes of "env.h" and "env-inl.h" in this directory. #32293

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e26be9
src: fix extra includes of "env.h" and "env-inl.h"
nkreeger Mar 16, 2020
0fbf83b
Merge branch 'master' into kreeger/include-fixes
nkreeger Mar 16, 2020
0805001
Review comments.
nkreeger Mar 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/node_crypto_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS

#include "env.h"
#include "node_crypto.h"
#include "v8.h"
#include <openssl/ssl.h>
Expand All @@ -13,6 +12,9 @@
#include <unordered_map>

namespace node {

class Environment;
Comment thread
nkreeger marked this conversation as resolved.
Outdated

namespace crypto {

// OPENSSL_free is a macro, so we need a wrapper function.
Expand Down
1 change: 0 additions & 1 deletion src/node_http_common-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#include "node_http_common.h"
#include "node.h"
#include "node_mem-inl.h"
#include "env-inl.h"
Copy link
Copy Markdown
Member

@addaleax addaleax Mar 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If removing this works, then it’s by accident – this file does require env-inl.h in order to work. Please leave the include here.

(You can test this by including only node_http_common-inl.h from a .cc file – compiling that file will fail without this line.)

Copy link
Copy Markdown
Member

@jasnell jasnell Mar 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can guarantee that removing this would break on some of the platforms as I had omitted this originally and had to fix it.

Copy link
Copy Markdown
Contributor Author

@nkreeger nkreeger Mar 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great thanks - any tips on better build testing? I git grep'ing for these items in header files and running make -j8 test as a blanket test. I see the x-platform integration tests pass...

@jasnell Please let me know if I'm stomping on anything you're doing. Just looking for some fun side-hacking :-)

Copy link
Copy Markdown
Member

@jasnell jasnell Mar 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope you're good :-) ... I'll adjust on my end if there are any merge conflicts.

#include "v8.h"

#include <algorithm>
Expand Down
3 changes: 2 additions & 1 deletion src/node_sockaddr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS

#include "env.h"
#include "memory_tracker.h"
#include "node.h"
#include "uv.h"
Expand All @@ -14,6 +13,8 @@

namespace node {

class Environment;

class SocketAddress : public MemoryRetainer {
public:
struct Hash {
Expand Down
1 change: 0 additions & 1 deletion src/stream_base-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include "stream_base.h"

#include "node.h"
#include "env-inl.h"
Comment thread
addaleax marked this conversation as resolved.
#include "v8.h"

namespace node {
Expand Down