Skip to content

Commit 42a28d0

Browse files
nkreegertargos
authored andcommitted
src: fix extra includes of "env.h" and "env-inl.h"
Due to how the Environment class is used throughout the codebase, there are a log of includes referencing eitehr env.h or env-inl.h. This commit cleans up the remaining extra includes of 'env.h' or 'env-inl.h' and adds forward declarations of the Environment class. PR-URL: #32293 Refs: #27531 Fixes: #27531 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent 93ff4ff commit 42a28d0

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

src/node_crypto_common.h

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
55

6-
#include "env.h"
76
#include "node_crypto.h"
87
#include "v8.h"
98
#include <openssl/ssl.h>

src/node_sockaddr.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
55

6-
#include "env.h"
76
#include "memory_tracker.h"
87
#include "node.h"
98
#include "uv.h"
@@ -14,6 +13,8 @@
1413

1514
namespace node {
1615

16+
class Environment;
17+
1718
class SocketAddress : public MemoryRetainer {
1819
public:
1920
struct Hash {

src/stream_base-inl.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33

44
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
55

6-
#include "stream_base.h"
7-
6+
#include "async_wrap-inl.h"
87
#include "node.h"
9-
#include "env-inl.h"
8+
#include "stream_base.h"
109
#include "v8.h"
1110

1211
namespace node {

src/stream_base.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33

44
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
55

6-
#include "async_wrap-inl.h"
6+
#include "env.h"
7+
#include "async_wrap.h"
78
#include "node.h"
89
#include "util.h"
910

0 commit comments

Comments
 (0)