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]>
nodejs · Apr 28, 2020 · 06953df · 06953df
1 parent ca4e652
commit 06953df
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/node_crypto_common.h b/src/node_crypto_common.h
@@ -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>

diff --git a/src/node_sockaddr.h b/src/node_sockaddr.h
@@ -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"
@@ -14,6 +13,8 @@
 
 namespace node {
 
+class Environment;
+
 class SocketAddress : public MemoryRetainer {
  public:
   struct Hash {

diff --git a/src/stream_base-inl.h b/src/stream_base-inl.h
@@ -3,10 +3,9 @@
 
 #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 
-#include "stream_base.h"
-
+#include "async_wrap-inl.h"
 #include "node.h"
-#include "env-inl.h"
+#include "stream_base.h"
 #include "v8.h"
 
 namespace node {

diff --git a/src/stream_base.h b/src/stream_base.h
@@ -3,7 +3,8 @@
 
 #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 
-#include "async_wrap-inl.h"
+#include "env.h"
+#include "async_wrap.h"
 #include "node.h"
 #include "util.h"