src: add include guards to internal headers

For consistency with the newly added src/base64.h header, check that NODE_WANT_INTERNALS is defined and set in internal headers. PR-URL: nodejs#6948 Refs: nodejs#6910 Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Trevor Norris <trev.norris@gmail.com>
Fishrock123 · May 30, 2016 · 73af4ee · 73af4ee
1 parent 04634ae
commit 73af4ee
Show file tree

Hide file tree

Showing 53 changed files with 204 additions and 4 deletions.
diff --git a/node.gyp b/node.gyp
@@ -706,6 +706,7 @@
         'GTEST_DONT_DEFINE_ASSERT_LE=1',
         'GTEST_DONT_DEFINE_ASSERT_LT=1',
         'GTEST_DONT_DEFINE_ASSERT_NE=1',
+        'NODE_WANT_INTERNALS=1',
       ],
       'sources': [
         'test/cctest/util.cc',

diff --git a/src/async-wrap-inl.h b/src/async-wrap-inl.h
@@ -1,6 +1,8 @@
 #ifndef SRC_ASYNC_WRAP_INL_H_
 #define SRC_ASYNC_WRAP_INL_H_
 
+#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #include "async-wrap.h"
 #include "base-object.h"
 #include "base-object-inl.h"
@@ -120,4 +122,6 @@ inline v8::Local<v8::Value> AsyncWrap::MakeCallback(
 
 }  // namespace node
 
+#endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #endif  // SRC_ASYNC_WRAP_INL_H_
diff --git a/src/async-wrap.h b/src/async-wrap.h
@@ -1,6 +1,8 @@
 #ifndef SRC_ASYNC_WRAP_H_
 #define SRC_ASYNC_WRAP_H_
 
+#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #include "base-object.h"
 #include "v8.h"
 
@@ -86,5 +88,6 @@ void LoadAsyncWrapperInfo(Environment* env);
 
 }  // namespace node
 
+#endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 
 #endif  // SRC_ASYNC_WRAP_H_
diff --git a/src/base-object-inl.h b/src/base-object-inl.h
@@ -1,6 +1,8 @@
 #ifndef SRC_BASE_OBJECT_INL_H_
 #define SRC_BASE_OBJECT_INL_H_
 
+#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #include "base-object.h"
 #include "env.h"
 #include "env-inl.h"
@@ -68,4 +70,6 @@ inline void BaseObject::ClearWeak() {
 
 }  // namespace node
 
+#endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #endif  // SRC_BASE_OBJECT_INL_H_
diff --git a/src/base-object.h b/src/base-object.h
@@ -1,6 +1,8 @@
 #ifndef SRC_BASE_OBJECT_H_
 #define SRC_BASE_OBJECT_H_
 
+#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #include "v8.h"
 
 namespace node {
@@ -48,4 +50,6 @@ class BaseObject {
 
 }  // namespace node
 
+#endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #endif  // SRC_BASE_OBJECT_H_
diff --git a/src/debug-agent.h b/src/debug-agent.h
@@ -22,6 +22,8 @@
 #ifndef SRC_DEBUG_AGENT_H_
 #define SRC_DEBUG_AGENT_H_
 
+#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #include "util.h"
 #include "util-inl.h"
 #include "uv.h"
@@ -132,4 +134,6 @@ class Agent {
 }  // namespace debugger
 }  // namespace node
 
+#endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #endif  // SRC_DEBUG_AGENT_H_
diff --git a/src/env-inl.h b/src/env-inl.h
@@ -1,6 +1,8 @@
 #ifndef SRC_ENV_INL_H_
 #define SRC_ENV_INL_H_
 
+#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #include "env.h"
 #include "node.h"
 #include "util.h"
@@ -576,4 +578,6 @@ inline v8::Local<v8::Object> Environment::NewInternalFieldObject() {
 
 }  // namespace node
 
+#endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #endif  // SRC_ENV_INL_H_
diff --git a/src/env.h b/src/env.h
@@ -1,6 +1,8 @@
 #ifndef SRC_ENV_H_
 #define SRC_ENV_H_
 
+#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #include "ares.h"
 #include "debug-agent.h"
 #include "handle_wrap.h"
@@ -647,4 +649,6 @@ class Environment {
 
 }  // namespace node
 
+#endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #endif  // SRC_ENV_H_
diff --git a/src/handle_wrap.h b/src/handle_wrap.h
@@ -1,6 +1,8 @@
 #ifndef SRC_HANDLE_WRAP_H_
 #define SRC_HANDLE_WRAP_H_
 
+#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #include "async-wrap.h"
 #include "util.h"
 #include "uv.h"
@@ -69,5 +71,6 @@ class HandleWrap : public AsyncWrap {
 
 }  // namespace node
 
+#endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
 
 #endif  // SRC_HANDLE_WRAP_H_
diff --git a/src/js_stream.h b/src/js_stream.h
@@ -1,6 +1,8 @@
 #ifndef SRC_JS_STREAM_H_
 #define SRC_JS_STREAM_H_
 
+#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #include "async-wrap.h"
 #include "env.h"
 #include "stream_base.h"
@@ -48,4 +50,6 @@ class JSStream : public AsyncWrap, public StreamBase {
 
 }  // namespace node
 
+#endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #endif  // SRC_JS_STREAM_H_
diff --git a/src/node_constants.h b/src/node_constants.h
@@ -1,6 +1,8 @@
 #ifndef SRC_NODE_CONSTANTS_H_
 #define SRC_NODE_CONSTANTS_H_
 
+#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #include "node.h"
 #include "v8.h"
 
@@ -37,4 +39,6 @@ extern const char* default_cipher_list;
 void DefineConstants(v8::Local<v8::Object> target);
 }  // namespace node
 
+#endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #endif  // SRC_NODE_CONSTANTS_H_
diff --git a/src/node_counters.h b/src/node_counters.h
@@ -1,6 +1,8 @@
 #ifndef SRC_NODE_COUNTERS_H_
 #define SRC_NODE_COUNTERS_H_
 
+#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #include "node.h"
 
 #ifdef HAVE_PERFCTR
@@ -31,4 +33,6 @@ void TermPerfCounters(v8::Local<v8::Object> target);
 
 }  // namespace node
 
+#endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #endif  // SRC_NODE_COUNTERS_H_
diff --git a/src/node_crypto.h b/src/node_crypto.h
@@ -1,6 +1,8 @@
 #ifndef SRC_NODE_CRYPTO_H_
 #define SRC_NODE_CRYPTO_H_
 
+#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #include "node.h"
 #include "node_crypto_clienthello.h"  // ClientHelloParser
 #include "node_crypto_clienthello-inl.h"
@@ -742,4 +744,6 @@ void InitCrypto(v8::Local<v8::Object> target);
 }  // namespace crypto
 }  // namespace node
 
+#endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #endif  // SRC_NODE_CRYPTO_H_
diff --git a/src/node_crypto_bio.h b/src/node_crypto_bio.h
@@ -1,6 +1,8 @@
 #ifndef SRC_NODE_CRYPTO_BIO_H_
 #define SRC_NODE_CRYPTO_BIO_H_
 
+#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #include "openssl/bio.h"
 #include "env.h"
 #include "env-inl.h"
@@ -134,4 +136,6 @@ class NodeBIO {
 
 }  // namespace node
 
+#endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #endif  // SRC_NODE_CRYPTO_BIO_H_
diff --git a/src/node_crypto_clienthello-inl.h b/src/node_crypto_clienthello-inl.h
@@ -1,6 +1,8 @@
 #ifndef SRC_NODE_CRYPTO_CLIENTHELLO_INL_H_
 #define SRC_NODE_CRYPTO_CLIENTHELLO_INL_H_
 
+#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #include "util.h"
 #include "util-inl.h"
 
@@ -53,4 +55,6 @@ inline bool ClientHelloParser::IsPaused() const {
 
 }  // namespace node
 
+#endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #endif  // SRC_NODE_CRYPTO_CLIENTHELLO_INL_H_
diff --git a/src/node_crypto_clienthello.h b/src/node_crypto_clienthello.h
@@ -1,6 +1,8 @@
 #ifndef SRC_NODE_CRYPTO_CLIENTHELLO_H_
 #define SRC_NODE_CRYPTO_CLIENTHELLO_H_
 
+#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #include "node.h"
 
 #include <stddef.h>  // size_t
@@ -112,4 +114,6 @@ class ClientHelloParser {
 
 }  // namespace node
 
+#endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #endif  // SRC_NODE_CRYPTO_CLIENTHELLO_H_
diff --git a/src/node_crypto_groups.h b/src/node_crypto_groups.h
@@ -1,6 +1,8 @@
 #ifndef SRC_NODE_CRYPTO_GROUPS_H_
 #define SRC_NODE_CRYPTO_GROUPS_H_
 
+#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 /*
     These modular groups were literally taken from:
        * RFC 2412 (groups 1 and 2)
@@ -388,4 +390,6 @@ static const modp_group modp_groups[] = {
 #undef V
 };
 
+#endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #endif  // SRC_NODE_CRYPTO_GROUPS_H_
diff --git a/src/node_dtrace.h b/src/node_dtrace.h
@@ -1,6 +1,8 @@
 #ifndef SRC_NODE_DTRACE_H_
 #define SRC_NODE_DTRACE_H_
 
+#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #include "node.h"
 #include "v8.h"
 #include "env.h"
@@ -58,4 +60,6 @@ void InitDTrace(Environment* env, v8::Local<v8::Object> target);
 
 }  // namespace node
 
+#endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #endif  // SRC_NODE_DTRACE_H_
diff --git a/src/node_file.h b/src/node_file.h
@@ -1,6 +1,8 @@
 #ifndef SRC_NODE_FILE_H_
 #define SRC_NODE_FILE_H_
 
+#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #include "node.h"
 #include "v8.h"
 
@@ -10,4 +12,6 @@ void InitFs(v8::Local<v8::Object> target);
 
 }  // namespace node
 
+#endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #endif  // SRC_NODE_FILE_H_
diff --git a/src/node_http_parser.h b/src/node_http_parser.h
@@ -1,6 +1,8 @@
 #ifndef SRC_NODE_HTTP_PARSER_H_
 #define SRC_NODE_HTTP_PARSER_H_
 
+#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #include "v8.h"
 
 #include "http_parser.h"
@@ -11,4 +13,6 @@ void InitHttpParser(v8::Local<v8::Object> target);
 
 }  // namespace node
 
+#endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #endif  // SRC_NODE_HTTP_PARSER_H_
diff --git a/src/node_i18n.h b/src/node_i18n.h
@@ -1,6 +1,8 @@
 #ifndef SRC_NODE_I18N_H_
 #define SRC_NODE_I18N_H_
 
+#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #include "node.h"
 
 #if defined(NODE_HAVE_I18N_SUPPORT)
@@ -18,4 +20,6 @@ bool InitializeICUDirectory(const char* icu_data_path);
 
 #endif  // NODE_HAVE_I18N_SUPPORT
 
+#endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #endif  // SRC_NODE_I18N_H_
diff --git a/src/node_internals.h b/src/node_internals.h
@@ -1,6 +1,8 @@
 #ifndef SRC_NODE_INTERNALS_H_
 #define SRC_NODE_INTERNALS_H_
 
+#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #include "node.h"
 #include "util.h"
 #include "util-inl.h"
@@ -313,4 +315,6 @@ v8::MaybeLocal<v8::Object> New(Environment* env, char* data, size_t length);
 
 }  // namespace node
 
+#endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #endif  // SRC_NODE_INTERNALS_H_
diff --git a/src/node_javascript.h b/src/node_javascript.h
@@ -1,6 +1,8 @@
 #ifndef SRC_NODE_JAVASCRIPT_H_
 #define SRC_NODE_JAVASCRIPT_H_
 
+#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #include "v8.h"
 #include "env.h"
 
@@ -11,4 +13,6 @@ v8::Local<v8::String> MainSource(Environment* env);
 
 }  // namespace node
 
+#endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #endif  // SRC_NODE_JAVASCRIPT_H_
diff --git a/src/node_lttng.h b/src/node_lttng.h
@@ -1,6 +1,8 @@
 #ifndef SRC_NODE_LTTNG_H_
 #define SRC_NODE_LTTNG_H_
 
+#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #include "node.h"
 #include "v8.h"
 #include "env.h"
@@ -37,4 +39,6 @@ void InitLTTNG(Environment* env, v8::Local<v8::Object> target);
 
 }  // namespace node
 
+#endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #endif  // SRC_NODE_LTTNG_H_
diff --git a/src/node_lttng_provider.h b/src/node_lttng_provider.h
@@ -1,6 +1,8 @@
 #ifndef SRC_NODE_LTTNG_PROVIDER_H_
 #define SRC_NODE_LTTNG_PROVIDER_H_
 
+#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #define TRACEPOINT_CREATE_PROBES
 #define TRACEPOINT_DEFINE
 #include "node_lttng_tp.h"
@@ -99,4 +101,6 @@ bool NODE_NET_STREAM_END_ENABLED() { return true; }
 
 }  // namespace node
 
+#endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
+
 #endif  // SRC_NODE_LTTNG_PROVIDER_H_