fix build when sanitizers are enabled and jemalloc is disabled

Summary: Add preprocessor checks to guard jemalloc headers if any sanitizer is enabled.

Reviewed By: yfeldblum

Differential Revision: D6441578

fbshipit-source-id: 85364fca5af33c95cd05f232d1e3f9cbac9a4120

diff --git a/folly/experimental/JemallocNodumpAllocator.h b/folly/experimental/JemallocNodumpAllocator.h
index 93b14f79dae823f5c015063706a3b8668a9e2e4c..16d6aec8a41970071bb8dc8087ffe0322f499381 100644 (file)
--- a/folly/experimental/JemallocNodumpAllocator.h
+++ b/folly/experimental/JemallocNodumpAllocator.h
@@ -18,9 +18,10 @@
 
 #pragma once
 
 
 #pragma once
 

+#include <folly/CPortability.h>

 #include <folly/portability/Config.h>
 
 #include <folly/portability/Config.h>
 

-#ifdef FOLLY_HAVE_LIBJEMALLOC
+#if defined(FOLLY_HAVE_LIBJEMALLOC) && !defined(FOLLY_SANITIZE)

 
 #include <folly/portability/SysMman.h>
 #include <jemalloc/jemalloc.h>
 
 #include <folly/portability/SysMman.h>
 #include <jemalloc/jemalloc.h>

diff --git a/folly/memory/test/MallctlHelperTest.cpp b/folly/memory/test/MallctlHelperTest.cpp
index dc447a7ac851bc285512df37c92319b1cc20c9ee..0b5444c86ecb50953bf88eac268b763c571f581e 100644 (file)
--- a/folly/memory/test/MallctlHelperTest.cpp
+++ b/folly/memory/test/MallctlHelperTest.cpp
@@ -15,11 +15,12 @@
  */
 
 #include <folly/memory/MallctlHelper.h>
  */
 
 #include <folly/memory/MallctlHelper.h>

+#include <folly/CPortability.h>

 #include <folly/init/Init.h>
 #include <folly/memory/Malloc.h>
 #include <folly/portability/GTest.h>
 
 #include <folly/init/Init.h>
 #include <folly/memory/Malloc.h>
 #include <folly/portability/GTest.h>
 

-#ifdef FOLLY_HAVE_LIBJEMALLOC
+#if defined(FOLLY_HAVE_LIBJEMALLOC) && !defined(FOLLY_SANITIZE)

 #include <jemalloc/jemalloc.h>
 #endif
 
 #include <jemalloc/jemalloc.h>
 #endif