Bug 979686 - Fix the non-(ARM|x86|x86_64) desktop build. r=kang
authorJed Davis <jld@mozilla.com>
Thu, 06 Mar 2014 12:23:06 -0800
changeset 189747 9a83a9b580ab2b452d2f95e8a5d4bc0aa4746441
parent 189746 cf2dac1262df7fd62d7351499f5ef82ede91e22c
child 189748 0f23c9b295ffc1830cb28e70266e52e259aa8cd0
push id3503
push userraliiev@mozilla.com
push dateMon, 28 Apr 2014 18:51:11 +0000
treeherdermozilla-beta@c95ac01e332e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskang
bugs979686
milestone30.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 979686 - Fix the non-(ARM|x86|x86_64) desktop build. r=kang
security/sandbox/linux/Sandbox.cpp
--- a/security/sandbox/linux/Sandbox.cpp
+++ b/security/sandbox/linux/Sandbox.cpp
@@ -30,19 +30,22 @@
 #ifdef MOZ_CRASHREPORTER
 #include "nsExceptionHandler.h"
 #endif
 
 #if defined(ANDROID)
 #include "android_ucontext.h"
 #include <android/log.h>
 #endif
-#include "seccomp_filter.h"
 
+#if defined(MOZ_CONTENT_SANDBOX)
+#include "seccomp_filter.h"
 #include "linux_seccomp.h"
+#endif
+
 #ifdef MOZ_LOGGING
 #define FORCE_PR_LOG 1
 #endif
 #include "prlog.h"
 #include "prenv.h"
 
 namespace mozilla {
 #if defined(ANDROID)