Skip to content

Commit 6444567

Browse files
bnoordhuisrvagg
bnoordhuis
authored and
rvagg
committed
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: #6948 Refs: #6910 Reviewed-By: Fedor Indutny <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Trevor Norris <[email protected]>
1 parent 8f623a3 commit 6444567

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+204
-4
lines changed

‎node.gyp

+1
Original file line numberDiff line numberDiff line change
@@ -706,6 +706,7 @@
706706
'GTEST_DONT_DEFINE_ASSERT_LE=1',
707707
'GTEST_DONT_DEFINE_ASSERT_LT=1',
708708
'GTEST_DONT_DEFINE_ASSERT_NE=1',
709+
'NODE_WANT_INTERNALS=1',
709710
],
710711
'sources': [
711712
'test/cctest/util.cc',

‎src/async-wrap-inl.h

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#ifndef SRC_ASYNC_WRAP_INL_H_
22
#define SRC_ASYNC_WRAP_INL_H_
33

4+
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
5+
46
#include "async-wrap.h"
57
#include "base-object.h"
68
#include "base-object-inl.h"
@@ -120,4 +122,6 @@ inline v8::Local<v8::Value> AsyncWrap::MakeCallback(
120122

121123
} // namespace node
122124

125+
#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
126+
123127
#endif // SRC_ASYNC_WRAP_INL_H_

‎src/async-wrap.h

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#ifndef SRC_ASYNC_WRAP_H_
22
#define SRC_ASYNC_WRAP_H_
33

4+
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
5+
46
#include "base-object.h"
57
#include "v8.h"
68

@@ -86,5 +88,6 @@ void LoadAsyncWrapperInfo(Environment* env);
8688

8789
} // namespace node
8890

91+
#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
8992

9093
#endif // SRC_ASYNC_WRAP_H_

‎src/base-object-inl.h

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#ifndef SRC_BASE_OBJECT_INL_H_
22
#define SRC_BASE_OBJECT_INL_H_
33

4+
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
5+
46
#include "base-object.h"
57
#include "env.h"
68
#include "env-inl.h"
@@ -68,4 +70,6 @@ inline void BaseObject::ClearWeak() {
6870

6971
} // namespace node
7072

73+
#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
74+
7175
#endif // SRC_BASE_OBJECT_INL_H_

‎src/base-object.h

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#ifndef SRC_BASE_OBJECT_H_
22
#define SRC_BASE_OBJECT_H_
33

4+
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
5+
46
#include "v8.h"
57

68
namespace node {
@@ -48,4 +50,6 @@ class BaseObject {
4850

4951
} // namespace node
5052

53+
#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
54+
5155
#endif // SRC_BASE_OBJECT_H_

‎src/debug-agent.h

+4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
#ifndef SRC_DEBUG_AGENT_H_
2323
#define SRC_DEBUG_AGENT_H_
2424

25+
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
26+
2527
#include "util.h"
2628
#include "util-inl.h"
2729
#include "uv.h"
@@ -132,4 +134,6 @@ class Agent {
132134
} // namespace debugger
133135
} // namespace node
134136

137+
#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
138+
135139
#endif // SRC_DEBUG_AGENT_H_

‎src/env-inl.h

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#ifndef SRC_ENV_INL_H_
22
#define SRC_ENV_INL_H_
33

4+
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
5+
46
#include "env.h"
57
#include "node.h"
68
#include "util.h"
@@ -576,4 +578,6 @@ inline v8::Local<v8::Object> Environment::NewInternalFieldObject() {
576578

577579
} // namespace node
578580

581+
#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
582+
579583
#endif // SRC_ENV_INL_H_

‎src/env.h

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#ifndef SRC_ENV_H_
22
#define SRC_ENV_H_
33

4+
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
5+
46
#include "ares.h"
57
#include "debug-agent.h"
68
#include "handle_wrap.h"
@@ -647,4 +649,6 @@ class Environment {
647649

648650
} // namespace node
649651

652+
#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
653+
650654
#endif // SRC_ENV_H_

‎src/handle_wrap.h

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#ifndef SRC_HANDLE_WRAP_H_
22
#define SRC_HANDLE_WRAP_H_
33

4+
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
5+
46
#include "async-wrap.h"
57
#include "util.h"
68
#include "uv.h"
@@ -69,5 +71,6 @@ class HandleWrap : public AsyncWrap {
6971

7072
} // namespace node
7173

74+
#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
7275

7376
#endif // SRC_HANDLE_WRAP_H_

‎src/js_stream.h

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#ifndef SRC_JS_STREAM_H_
22
#define SRC_JS_STREAM_H_
33

4+
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
5+
46
#include "async-wrap.h"
57
#include "env.h"
68
#include "stream_base.h"
@@ -48,4 +50,6 @@ class JSStream : public AsyncWrap, public StreamBase {
4850

4951
} // namespace node
5052

53+
#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
54+
5155
#endif // SRC_JS_STREAM_H_

‎src/node_constants.h

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#ifndef SRC_NODE_CONSTANTS_H_
22
#define SRC_NODE_CONSTANTS_H_
33

4+
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
5+
46
#include "node.h"
57
#include "v8.h"
68

@@ -37,4 +39,6 @@ extern const char* default_cipher_list;
3739
void DefineConstants(v8::Local<v8::Object> target);
3840
} // namespace node
3941

42+
#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
43+
4044
#endif // SRC_NODE_CONSTANTS_H_

‎src/node_counters.h

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#ifndef SRC_NODE_COUNTERS_H_
22
#define SRC_NODE_COUNTERS_H_
33

4+
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
5+
46
#include "node.h"
57

68
#ifdef HAVE_PERFCTR
@@ -31,4 +33,6 @@ void TermPerfCounters(v8::Local<v8::Object> target);
3133

3234
} // namespace node
3335

36+
#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
37+
3438
#endif // SRC_NODE_COUNTERS_H_

‎src/node_crypto.h

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#ifndef SRC_NODE_CRYPTO_H_
22
#define SRC_NODE_CRYPTO_H_
33

4+
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
5+
46
#include "node.h"
57
#include "node_crypto_clienthello.h" // ClientHelloParser
68
#include "node_crypto_clienthello-inl.h"
@@ -742,4 +744,6 @@ void InitCrypto(v8::Local<v8::Object> target);
742744
} // namespace crypto
743745
} // namespace node
744746

747+
#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
748+
745749
#endif // SRC_NODE_CRYPTO_H_

‎src/node_crypto_bio.h

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#ifndef SRC_NODE_CRYPTO_BIO_H_
22
#define SRC_NODE_CRYPTO_BIO_H_
33

4+
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
5+
46
#include "openssl/bio.h"
57
#include "env.h"
68
#include "env-inl.h"
@@ -134,4 +136,6 @@ class NodeBIO {
134136

135137
} // namespace node
136138

139+
#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
140+
137141
#endif // SRC_NODE_CRYPTO_BIO_H_

‎src/node_crypto_clienthello-inl.h

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#ifndef SRC_NODE_CRYPTO_CLIENTHELLO_INL_H_
22
#define SRC_NODE_CRYPTO_CLIENTHELLO_INL_H_
33

4+
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
5+
46
#include "util.h"
57
#include "util-inl.h"
68

@@ -53,4 +55,6 @@ inline bool ClientHelloParser::IsPaused() const {
5355

5456
} // namespace node
5557

58+
#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
59+
5660
#endif // SRC_NODE_CRYPTO_CLIENTHELLO_INL_H_

‎src/node_crypto_clienthello.h

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#ifndef SRC_NODE_CRYPTO_CLIENTHELLO_H_
22
#define SRC_NODE_CRYPTO_CLIENTHELLO_H_
33

4+
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
5+
46
#include "node.h"
57

68
#include <stddef.h> // size_t
@@ -112,4 +114,6 @@ class ClientHelloParser {
112114

113115
} // namespace node
114116

117+
#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
118+
115119
#endif // SRC_NODE_CRYPTO_CLIENTHELLO_H_

‎src/node_crypto_groups.h

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#ifndef SRC_NODE_CRYPTO_GROUPS_H_
22
#define SRC_NODE_CRYPTO_GROUPS_H_
33

4+
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
5+
46
/*
57
These modular groups were literally taken from:
68
* RFC 2412 (groups 1 and 2)
@@ -388,4 +390,6 @@ static const modp_group modp_groups[] = {
388390
#undef V
389391
};
390392

393+
#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
394+
391395
#endif // SRC_NODE_CRYPTO_GROUPS_H_

‎src/node_dtrace.h

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#ifndef SRC_NODE_DTRACE_H_
22
#define SRC_NODE_DTRACE_H_
33

4+
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
5+
46
#include "node.h"
57
#include "v8.h"
68
#include "env.h"
@@ -58,4 +60,6 @@ void InitDTrace(Environment* env, v8::Local<v8::Object> target);
5860

5961
} // namespace node
6062

63+
#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
64+
6165
#endif // SRC_NODE_DTRACE_H_

‎src/node_file.h

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#ifndef SRC_NODE_FILE_H_
22
#define SRC_NODE_FILE_H_
33

4+
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
5+
46
#include "node.h"
57
#include "v8.h"
68

@@ -10,4 +12,6 @@ void InitFs(v8::Local<v8::Object> target);
1012

1113
} // namespace node
1214

15+
#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
16+
1317
#endif // SRC_NODE_FILE_H_

‎src/node_http_parser.h

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#ifndef SRC_NODE_HTTP_PARSER_H_
22
#define SRC_NODE_HTTP_PARSER_H_
33

4+
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
5+
46
#include "v8.h"
57

68
#include "http_parser.h"
@@ -11,4 +13,6 @@ void InitHttpParser(v8::Local<v8::Object> target);
1113

1214
} // namespace node
1315

16+
#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
17+
1418
#endif // SRC_NODE_HTTP_PARSER_H_

‎src/node_i18n.h

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#ifndef SRC_NODE_I18N_H_
22
#define SRC_NODE_I18N_H_
33

4+
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
5+
46
#include "node.h"
57

68
#if defined(NODE_HAVE_I18N_SUPPORT)
@@ -18,4 +20,6 @@ bool InitializeICUDirectory(const char* icu_data_path);
1820

1921
#endif // NODE_HAVE_I18N_SUPPORT
2022

23+
#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
24+
2125
#endif // SRC_NODE_I18N_H_

‎src/node_internals.h

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#ifndef SRC_NODE_INTERNALS_H_
22
#define SRC_NODE_INTERNALS_H_
33

4+
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
5+
46
#include "node.h"
57
#include "util.h"
68
#include "util-inl.h"
@@ -313,4 +315,6 @@ v8::MaybeLocal<v8::Object> New(Environment* env, char* data, size_t length);
313315

314316
} // namespace node
315317

318+
#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
319+
316320
#endif // SRC_NODE_INTERNALS_H_

‎src/node_javascript.h

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#ifndef SRC_NODE_JAVASCRIPT_H_
22
#define SRC_NODE_JAVASCRIPT_H_
33

4+
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
5+
46
#include "v8.h"
57
#include "env.h"
68

@@ -11,4 +13,6 @@ v8::Local<v8::String> MainSource(Environment* env);
1113

1214
} // namespace node
1315

16+
#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
17+
1418
#endif // SRC_NODE_JAVASCRIPT_H_

‎src/node_lttng.h

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#ifndef SRC_NODE_LTTNG_H_
22
#define SRC_NODE_LTTNG_H_
33

4+
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
5+
46
#include "node.h"
57
#include "v8.h"
68
#include "env.h"
@@ -37,4 +39,6 @@ void InitLTTNG(Environment* env, v8::Local<v8::Object> target);
3739

3840
} // namespace node
3941

42+
#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
43+
4044
#endif // SRC_NODE_LTTNG_H_

‎src/node_lttng_provider.h

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#ifndef SRC_NODE_LTTNG_PROVIDER_H_
22
#define SRC_NODE_LTTNG_PROVIDER_H_
33

4+
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
5+
46
#define TRACEPOINT_CREATE_PROBES
57
#define TRACEPOINT_DEFINE
68
#include "node_lttng_tp.h"
@@ -99,4 +101,6 @@ bool NODE_NET_STREAM_END_ENABLED() { return true; }
99101

100102
} // namespace node
101103

104+
#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
105+
102106
#endif // SRC_NODE_LTTNG_PROVIDER_H_

0 commit comments

Comments
 (0)