src: fix InspectorStarted macro guard

danbev · kfarnung · commit 715c7e027ff2 · 2017-05-25T15:18:24.000-07:00
Currently the InspectorStarted function is guarded by the else clause of the NODE_USE_V8_PLATFORM macro. If node is configured --without-ssl then NODE_USE_V8_PLATFORM will be 1 but the nested HAVE_INSPECTOR macro will not be 0 which will lead to that there will be no InspectorStarted function defined. If building --without-inspector or --without-ssl the following compilation error will occur: ../src/node.cc:4470:57: error: no member named 'InspectorStarted' in 'node::(anonymous struct at ../src/node.cc:241:8)' if (debug_options.inspector_enabled() && !v8_platform.InspectorStarted(&env)) ~~~~~~~~~~~ ^ ../src/node.cc:4470:57: error: no member named 'InspectorStarted' in 'node::(anonymous struct at ../src/node.cc:241:8)' if (debug_options.inspector_enabled() && !v8_platform.InspectorStarted(&env)) ~~~~~~~~~~~ ^ 1 error generated. This commit adds a separate if preprocessor directive to catch the case when either --without-ssl/--without-inspector and --without-v8-platform combinations are used to configure node. PR-URL: nodejs/node#13167 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Kyle Farnung <kfarnung@microsoft.com>
diff --git a/src/node.cc b/src/node.cc
@@ -303,10 +303,13 @@ static struct {
                     "so event tracing is not available.\n");
   }
   void StopTracingAgent() {}
+#endif  // !NODE_USE_V8_PLATFORM
+
+#if NODE_USE_V8_PLATFORM == 0 || HAVE_INSPECTOR == 0
   bool InspectorStarted(Environment *env) {
     return false;
   }
-#endif  // !NODE_USE_V8_PLATFORM
+#endif  //  !NODE_USE_V8_PLATFORM || !HAVE_INSPECTOR
 } v8_platform;
 
 #ifdef __POSIX__

Original file line number	Diff line number	Diff line change
`@@ -303,10 +303,13 @@ static struct {`
`303`	`303`	`"so event tracing is not available.\n");`
`304`	`304`	`}`
`305`	`305`	`void StopTracingAgent() {}`
	`306`	`+#endif // !NODE_USE_V8_PLATFORM`
	`307`	`+`
	`308`	`+#if NODE_USE_V8_PLATFORM == 0 \|\| HAVE_INSPECTOR == 0`
`306`	`309`	`bool InspectorStarted(Environment *env) {`
`307`	`310`	`return false;`
`308`	`311`	`}`
`309`		`-#endif // !NODE_USE_V8_PLATFORM`
	`312`	`+#endif // !NODE_USE_V8_PLATFORM \|\| !HAVE_INSPECTOR`
`310`	`313`	`} v8_platform;`
`311`	`314`
`312`	`315`	`#ifdef __POSIX__`