Bug 1504188 - Don't define AppendSandboxParams if building the sandbox is disabled. r=haik

marco-c · marco-c · commit 0ad64677795d · 2018-11-02T13:59:43.000+01:00
--HG--
extra : rebase_source : 6ccb5a57b5a19b02deb25893f2a1c651346a4d4a
diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp
@@ -2127,7 +2127,7 @@ ContentParent::GetTestShellSingleton()
   return static_cast<TestShellParent*>(p);
 }
 
-#ifdef XP_MACOSX
+#if defined(XP_MACOSX) && defined(MOZ_CONTENT_SANDBOX)
 void
 ContentParent::AppendSandboxParams(std::vector<std::string> &aArgs)
 {
@@ -2239,7 +2239,7 @@ ContentParent::AppendSandboxParams(std::vector<std::string> &aArgs)
   }
 #endif // DEBUG
 }
-#endif // XP_MACOSX
+#endif // XP_MACOSX && MOZ_CONTENT_SANDBOX
 
 bool
 ContentParent::LaunchSubprocess(ProcessPriority aInitialPriority /* = PROCESS_PRIORITY_FOREGROUND */)

Original file line number	Diff line number	Diff line change
`@@ -2127,7 +2127,7 @@ ContentParent::GetTestShellSingleton()`
`2127`	`2127`	`return static_cast<TestShellParent*>(p);`
`2128`	`2128`	`}`
`2129`	`2129`
`2130`		`-#ifdef XP_MACOSX`
	`2130`	`+#if defined(XP_MACOSX) && defined(MOZ_CONTENT_SANDBOX)`
`2131`	`2131`	`void`
`2132`	`2132`	`ContentParent::AppendSandboxParams(std::vector<std::string> &aArgs)`
`2133`	`2133`	`{`
`@@ -2239,7 +2239,7 @@ ContentParent::AppendSandboxParams(std::vector<std::string> &aArgs)`
`2239`	`2239`	`}`
`2240`	`2240`	`#endif // DEBUG`
`2241`	`2241`	`}`
`2242`		`-#endif // XP_MACOSX`
	`2242`	`+#endif // XP_MACOSX && MOZ_CONTENT_SANDBOX`
`2243`	`2243`
`2244`	`2244`	`bool`
`2245`	`2245`	`ContentParent::LaunchSubprocess(ProcessPriority aInitialPriority /* = PROCESS_PRIORITY_FOREGROUND */)`