From f2e3d9dc5ff660953f308317497a3439b8cee4c1 Mon Sep 17 00:00:00 2001 From: "Christopher J. Brody" Date: Wed, 23 Nov 2016 14:42:29 +0100 Subject: [PATCH] src: fix dependencies in node.h * remove node_internals.h dependency from node.h; adjust other source * remove some other, extra includes from node.h * remove break in namespace node block from node.h --- src/backtrace_posix.cc | 2 +- src/env.cc | 2 ++ src/node.h | 23 ----------------------- src/node_buffer.cc | 4 +++- src/node_config.cc | 2 +- src/node_constants.cc | 1 + src/node_dtrace.cc | 2 ++ src/node_i18n.cc | 2 ++ src/node_i18n.h | 2 +- src/node_os.cc | 5 +++-- src/node_util.cc | 5 +++-- src/spawn_sync.cc | 1 + src/spawn_sync.h | 3 ++- src/string_bytes.cc | 2 ++ src/string_search.h | 3 +-- 15 files changed, 25 insertions(+), 34 deletions(-) diff --git a/src/backtrace_posix.cc b/src/backtrace_posix.cc index 8fd798757a544a..0c69d820e7212a 100644 --- a/src/backtrace_posix.cc +++ b/src/backtrace_posix.cc @@ -1,4 +1,4 @@ -#include "node.h" +#include "node_internals.h" #if defined(__linux__) #include diff --git a/src/env.cc b/src/env.cc index efa2d53f0435b2..106df00c202b43 100644 --- a/src/env.cc +++ b/src/env.cc @@ -1,6 +1,8 @@ #include "env.h" #include "env-inl.h" #include "async-wrap.h" +#include "node_internals.h" + #include "v8.h" #include "v8-profiler.h" diff --git a/src/node.h b/src/node.h index 873551fa338a97..04d94cac385d8b 100644 --- a/src/node.h +++ b/src/node.h @@ -150,34 +150,11 @@ NODE_EXTERN v8::Local MakeCallback( int argc, v8::Local* argv); -} // namespace node - -#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS -#include "node_internals.h" -#endif - -#include -#include - #ifndef NODE_STRINGIFY #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n) #define NODE_STRINGIFY_HELPER(n) #n #endif -#ifdef _WIN32 -// TODO(tjfontaine) consider changing the usage of ssize_t to ptrdiff_t -#if !defined(_SSIZE_T_) && !defined(_SSIZE_T_DEFINED) -typedef intptr_t ssize_t; -# define _SSIZE_T_ -# define _SSIZE_T_DEFINED -#endif -#else // !_WIN32 -# include // size_t, ssize_t -#endif // _WIN32 - - -namespace node { - NODE_EXTERN extern bool no_deprecation; #if HAVE_OPENSSL && NODE_FIPS_MODE NODE_EXTERN extern bool enable_fips_crypto; diff --git a/src/node_buffer.cc b/src/node_buffer.cc index 540de1827f9716..1f66e7034ea2b5 100644 --- a/src/node_buffer.cc +++ b/src/node_buffer.cc @@ -1,4 +1,3 @@ -#include "node.h" #include "node_buffer.h" #include "env.h" @@ -7,6 +6,9 @@ #include "string_search.h" #include "util.h" #include "util-inl.h" + +#include "node_internals.h" + #include "v8-profiler.h" #include "v8.h" diff --git a/src/node_config.cc b/src/node_config.cc index 401345f6a608be..a07ddaa6ba1a1e 100644 --- a/src/node_config.cc +++ b/src/node_config.cc @@ -1,5 +1,5 @@ -#include "node.h" #include "node_i18n.h" +#include "node_internals.h" #include "env.h" #include "env-inl.h" #include "util.h" diff --git a/src/node_constants.cc b/src/node_constants.cc index 8aa65ee7e23c35..eb2306a59db131 100644 --- a/src/node_constants.cc +++ b/src/node_constants.cc @@ -1,6 +1,7 @@ #include "node_constants.h" #include "env.h" #include "env-inl.h" +#include "node_internals.h" #include "uv.h" #include "zlib.h" diff --git a/src/node_dtrace.cc b/src/node_dtrace.cc index e42c20877df126..6b3a4222f1ad7a 100644 --- a/src/node_dtrace.cc +++ b/src/node_dtrace.cc @@ -27,6 +27,8 @@ #include "util.h" +#include "node_internals.h" + #include namespace node { diff --git a/src/node_i18n.cc b/src/node_i18n.cc index bab06cfcdfc41a..065ec17976a8d2 100644 --- a/src/node_i18n.cc +++ b/src/node_i18n.cc @@ -29,6 +29,8 @@ #include "env-inl.h" #include "util.h" #include "util-inl.h" +#include "node_internals.h" + #include "v8.h" #include diff --git a/src/node_i18n.h b/src/node_i18n.h index 21a579526ddc1a..c9a29b09e16603 100644 --- a/src/node_i18n.h +++ b/src/node_i18n.h @@ -3,7 +3,7 @@ #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS -#include "node.h" +#include "util.h" #if defined(NODE_HAVE_I18N_SUPPORT) diff --git a/src/node_os.cc b/src/node_os.cc index d8276f463d6625..a566bec2d43c76 100644 --- a/src/node_os.cc +++ b/src/node_os.cc @@ -1,8 +1,9 @@ -#include "node.h" -#include "v8.h" #include "env.h" #include "env-inl.h" #include "string_bytes.h" +#include "node_internals.h" + +#include "v8.h" #include #include diff --git a/src/node_util.cc b/src/node_util.cc index c231983e57a2df..886c8d57f74d41 100644 --- a/src/node_util.cc +++ b/src/node_util.cc @@ -1,8 +1,9 @@ -#include "node.h" #include "node_watchdog.h" -#include "v8.h" #include "env.h" #include "env-inl.h" +#include "node_internals.h" + +#include "v8.h" namespace node { namespace util { diff --git a/src/spawn_sync.cc b/src/spawn_sync.cc index 79f10a0ea2594d..ace1812e8e92ab 100644 --- a/src/spawn_sync.cc +++ b/src/spawn_sync.cc @@ -2,6 +2,7 @@ #include "env-inl.h" #include "string_bytes.h" #include "util.h" +#include "node_internals.h" #include #include diff --git a/src/spawn_sync.h b/src/spawn_sync.h index 8f4c05aa5f4768..fb5f41b2b595bd 100644 --- a/src/spawn_sync.h +++ b/src/spawn_sync.h @@ -3,9 +3,10 @@ #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS -#include "node.h" #include "node_buffer.h" +#include "uv.h" + namespace node { using v8::Array; diff --git a/src/string_bytes.cc b/src/string_bytes.cc index 882ca6e3e89bd3..70d2da6618d0fe 100644 --- a/src/string_bytes.cc +++ b/src/string_bytes.cc @@ -3,6 +3,8 @@ #include "base64.h" #include "node.h" #include "node_buffer.h" +#include "node_internals.h" + #include "v8.h" #include diff --git a/src/string_search.h b/src/string_search.h index abc69edb87621d..67fe91128f2c66 100644 --- a/src/string_search.h +++ b/src/string_search.h @@ -7,8 +7,7 @@ #if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS -#include "node.h" -#include +#include "util.h" namespace node { namespace stringsearch {