Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

src: add and fix some preprocessor comments #40701

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/allocated_buffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,6 @@ struct AllocatedBuffer {

} // namespace node

#endif // NODE_WANT_INTERNALS
#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS

#endif // SRC_ALLOCATED_BUFFER_H_
2 changes: 1 addition & 1 deletion src/api/exceptions.cc
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ Local<Value> WinapiErrnoException(Isolate* isolate,

return e;
}
#endif
#endif // _WIN32

// Implement the legacy name exposed in node.h. This has not been in fact
// fatal any more, as the user can handle the exception in the
Expand Down
2 changes: 1 addition & 1 deletion src/crypto/crypto_tls.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1474,7 +1474,7 @@ unsigned int TLSWrap::PskClientCallback(
return psk_buf.length();
}

#endif
#endif // ifndef OPENSSL_NO_PSK

void TLSWrap::GetWriteQueueSize(const FunctionCallbackInfo<Value>& info) {
TLSWrap* wrap;
Expand Down
4 changes: 2 additions & 2 deletions src/node.cc
Original file line number Diff line number Diff line change
Expand Up @@ -953,7 +953,7 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,
}
# endif

#endif
#endif // defined(NODE_HAVE_I18N_SUPPORT)

NativeModuleEnv::InitializeCodeCache();

Expand Down Expand Up @@ -1084,7 +1084,7 @@ InitializationResult InitializeOncePerProcess(
return result;
}
}
#else
#else // OPENSSL_VERSION_MAJOR < 3
if (FIPS_mode()) {
OPENSSL_init();
}
Expand Down
2 changes: 1 addition & 1 deletion src/node_internals.h
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ class ThreadPoolWork {

#if defined(__POSIX__) && !defined(__ANDROID__) && !defined(__CloudABI__)
#define NODE_IMPLEMENTS_POSIX_CREDENTIALS 1
#endif // __POSIX__ && !defined(__ANDROID__) && !defined(__CloudABI__)
#endif // defined(__POSIX__) && !defined(__ANDROID__) && !defined(__CloudABI__)

namespace credentials {
bool SafeGetenv(const char* key, std::string* text, Environment* env = nullptr);
Expand Down
2 changes: 1 addition & 1 deletion src/node_native_module.cc
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ void NativeModuleLoader::InitializeModuleCategories() {

#if !NODE_USE_V8_PLATFORM || !defined(NODE_HAVE_I18N_SUPPORT)
"trace_events",
#endif // !NODE_USE_V8_PLATFORM
#endif // !NODE_USE_V8_PLATFORM || !defined(NODE_HAVE_I18N_SUPPORT)

#if !HAVE_OPENSSL
"crypto",
Expand Down
5 changes: 3 additions & 2 deletions src/node_options.cc
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ void PerProcessOptions::CheckOptions(std::vector<std::string>* errors) {
if ((secure_heap_min & (secure_heap_min - 1)) != 0)
errors->push_back("--secure-heap-min must be a power of 2");
}
#endif
#endif // HAVE_OPENSSL

if (use_largepages != "off" &&
use_largepages != "on" &&
use_largepages != "silent") {
Expand Down Expand Up @@ -816,7 +817,7 @@ PerProcessOptionsParser::PerProcessOptionsParser(
"minimum allocation size from the OpenSSL secure heap",
&PerProcessOptions::secure_heap_min,
kAllowedInEnvironment);
#endif
#endif // HAVE_OPENSSL
#if OPENSSL_VERSION_MAJOR >= 3
AddOption("--openssl-legacy-provider",
"enable OpenSSL 3.0 legacy provider",
Expand Down
2 changes: 1 addition & 1 deletion src/node_report.cc
Original file line number Diff line number Diff line change
Expand Up @@ -687,7 +687,7 @@ static void PrintResourceUsage(JSONWriter* writer) {
writer->json_objectend();
writer->json_objectend();
}
#endif
#endif // RUSAGE_THREAD
}

// Report operating system information.
Expand Down
2 changes: 1 addition & 1 deletion src/node_sockaddr-inl.h
Original file line number Diff line number Diff line change
Expand Up @@ -262,5 +262,5 @@ v8::MaybeLocal<v8::Value> SocketAddressBlockList::Rule::ToV8String(
}
} // namespace node

#endif // NODE_WANT_INTERNALS
#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
#endif // SRC_NODE_SOCKADDR_INL_H_
2 changes: 1 addition & 1 deletion src/node_sockaddr.h
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,6 @@ class SocketAddressBlockListWrap : public BaseObject {

} // namespace node

#endif // NOE_WANT_INTERNALS
#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS

#endif // SRC_NODE_SOCKADDR_H_
4 changes: 2 additions & 2 deletions src/node_url.cc
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ bool ToASCII(const std::string& input, std::string* output) {
output->assign(*buf, buf.length());
return true;
}
#else
#else // !defined(NODE_HAVE_I18N_SUPPORT)
// Intentional non-ops if ICU is not present.
bool ToUnicode(const std::string& input, std::string* output) {
*output = input;
Expand All @@ -342,7 +342,7 @@ bool ToASCII(const std::string& input, std::string* output) {
*output = input;
return true;
}
#endif
#endif // !defined(NODE_HAVE_I18N_SUPPORT)

#define NS_IN6ADDRSZ 16

Expand Down
2 changes: 1 addition & 1 deletion src/node_worker.cc
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ void Worker::New(const FunctionCallbackInfo<Value>& args) {
return;
}
}
#endif
#endif // NODE_WITHOUT_NODE_OPTIONS
}

if (args[2]->IsArray()) {
Expand Down
2 changes: 1 addition & 1 deletion src/stream_pipe.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,6 @@ class StreamPipe : public AsyncWrap {

} // namespace node

#endif
#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS

#endif // SRC_STREAM_PIPE_H_