Bug 931998 - Enable MOZ_CONTENT_SANDBOX for XP_UNIX instead of XP_LINUX so it gets included in B2G. r=bsmedberg

This commit is contained in:
Brian R. Bondy 2013-10-28 20:28:21 -07:00
parent bf0b9dd61e
commit 0286780f30

View File

@ -28,7 +28,7 @@
#include "mozilla/layers/PCompositorChild.h" #include "mozilla/layers/PCompositorChild.h"
#include "mozilla/net/NeckoChild.h" #include "mozilla/net/NeckoChild.h"
#include "mozilla/Preferences.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" #include "mozilla/Sandbox.h"
#endif #endif
#include "mozilla/unused.h" #include "mozilla/unused.h"
@ -553,7 +553,7 @@ ContentChild::RecvSetProcessPrivileges(const ChildPrivileges& aPrivs)
aPrivs; aPrivs;
// If this fails, we die. // If this fails, we die.
SetCurrentProcessPrivileges(privs); 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 // SetCurrentProcessSandbox should be moved close to process initialization
// time if/when possible. SetCurrentProcessPrivileges should probably be // time if/when possible. SetCurrentProcessPrivileges should probably be
// moved as well. Right now this is set ONLY if we receive the // moved as well. Right now this is set ONLY if we receive the