Bug 1504188 - Don't include Sandbox.h and don't use EarlyStartMacSand…

…boxIfEnabled if the sandbox is disabled. r=haik --HG-- extra : rebase_source : 228e7ffdd20e622f05c5c52a82109c802d2498b9
dothq · Nov 2, 2018 · d8c93be · d8c93be
1 parent 0ad6467
commit d8c93be
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/browser/app/nsBrowserApp.cpp b/browser/app/nsBrowserApp.cpp
@@ -43,7 +43,7 @@
 #include "FuzzerDefs.h"
 #endif
 
-#ifdef XP_MACOSX
+#if defined(XP_MACOSX) && defined(MOZ_CONTENT_SANDBOX)
 #include "mozilla/Sandbox.h"
 #endif
 
@@ -267,7 +267,7 @@ int main(int argc, char* argv[], char* envp[])
 {
   mozilla::TimeStamp start = mozilla::TimeStamp::Now();
 
-#ifdef XP_MACOSX
+#if defined(XP_MACOSX) && defined(MOZ_CONTENT_SANDBOX)
   if (argc > 1 && IsArg(argv[1], "contentproc")) {
     std::string err;
     if (!mozilla::EarlyStartMacSandboxIfEnabled(argc, argv, err)) {

diff --git a/ipc/app/MozillaRuntimeMain.cpp b/ipc/app/MozillaRuntimeMain.cpp
@@ -9,7 +9,7 @@
 #include "mozilla/Bootstrap.h"
 #include "mozilla/WindowsDllBlocklist.h"
 
-#ifdef XP_MACOSX
+#if defined(XP_MACOSX) && defined(MOZ_CONTENT_SANDBOX)
 #include "mozilla/Sandbox.h"
 #endif
 
@@ -18,7 +18,7 @@ using namespace mozilla;
 int
 main(int argc, char *argv[])
 {
-#ifdef XP_MACOSX
+#if defined(XP_MACOSX) && defined(MOZ_CONTENT_SANDBOX)
   std::string err;
   if (!mozilla::EarlyStartMacSandboxIfEnabled(argc, argv, err)) {
     fprintf(stderr, "Sandbox error: %s\n", err.c_str());