Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / content / common / sandbox_linux / sandbox_linux.h

diff --git a/src/content/common/sandbox_linux/sandbox_linux.h b/src/content/common/sandbox_linux/sandbox_linux.h
index 04f0748..a5a2322 100644 (file)
--- a/src/content/common/sandbox_linux/sandbox_linux.h
+++ b/src/content/common/sandbox_linux/sandbox_linux.h
@@ -12,8 +12,10 @@
 #include "content/public/common/sandbox_linux.h"
 
 #if defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER) || \
-    defined(LEAK_SANITIZER) || defined(UNDEFINED_SANITIZER)
+    defined(THREAD_SANITIZER) || defined(LEAK_SANITIZER) || \
+    defined(UNDEFINED_SANITIZER)
 #include <sanitizer/common_interface_defs.h>
+#define ANY_OF_AMTLU_SANITIZER 1
 #endif
 
 template <typename T> struct DefaultSingletonTraits;
@@ -87,8 +89,7 @@ class LinuxSandbox {
   // to make some vulnerabilities harder to exploit.
   bool LimitAddressSpace(const std::string& process_type);
 
-#if defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER) || \
-    defined(LEAK_SANITIZER) || defined(UNDEFINED_SANITIZER)
+#if defined(ANY_OF_AMTLU_SANITIZER)
   __sanitizer_sandbox_arguments* sanitizer_args() const {
     return sanitizer_args_.get();
   };
@@ -132,8 +133,7 @@ class LinuxSandbox {
   bool seccomp_bpf_supported_;  // Accurate if pre_initialized_.
   bool yama_is_enforcing_;  // Accurate if pre_initialized_.
   scoped_ptr<sandbox::SetuidSandboxClient> setuid_sandbox_client_;
-#if defined(ADDRESS_SANITIZER) || defined(MEMORY_SANITIZER) || \
-    defined(LEAK_SANITIZER) || defined(UNDEFINED_SANITIZER)
+#if defined(ANY_OF_AMTLU_SANITIZER)
   scoped_ptr<__sanitizer_sandbox_arguments> sanitizer_args_;
 #endif