From 0286780f30b0a9efd0e84d29001152a8bbf19bfa Mon Sep 17 00:00:00 2001 From: "Brian R. Bondy" Date: Mon, 28 Oct 2013 20:28:21 -0700 Subject: [PATCH] Bug 931998 - Enable MOZ_CONTENT_SANDBOX for XP_UNIX instead of XP_LINUX so it gets included in B2G. r=bsmedberg --- dom/ipc/ContentChild.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp index 340dd1025c1..95e123c5592 100644 --- a/dom/ipc/ContentChild.cpp +++ b/dom/ipc/ContentChild.cpp @@ -28,7 +28,7 @@ #include "mozilla/layers/PCompositorChild.h" #include "mozilla/net/NeckoChild.h" #include "mozilla/Preferences.h" -#if defined(MOZ_CONTENT_SANDBOX) && defined(XP_LINUX) +#if defined(MOZ_CONTENT_SANDBOX) && defined(XP_UNIX) #include "mozilla/Sandbox.h" #endif #include "mozilla/unused.h" @@ -553,7 +553,7 @@ ContentChild::RecvSetProcessPrivileges(const ChildPrivileges& aPrivs) aPrivs; // If this fails, we die. SetCurrentProcessPrivileges(privs); -#if defined(MOZ_CONTENT_SANDBOX) && defined(XP_LINUX) +#if defined(MOZ_CONTENT_SANDBOX) && defined(XP_UNIX) // SetCurrentProcessSandbox should be moved close to process initialization // time if/when possible. SetCurrentProcessPrivileges should probably be // moved as well. Right now this is set ONLY if we receive the