Commit b71a1b76 authored by Igor Sugak's avatar Igor Sugak Committed by Facebook Github Bot

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
parent 96ac8f8f
...@@ -18,9 +18,10 @@ ...@@ -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 <folly/portability/SysMman.h>
#include <jemalloc/jemalloc.h> #include <jemalloc/jemalloc.h>
......
...@@ -15,11 +15,12 @@ ...@@ -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/init/Init.h>
#include <folly/memory/Malloc.h> #include <folly/memory/Malloc.h>
#include <folly/portability/GTest.h> #include <folly/portability/GTest.h>
#ifdef FOLLY_HAVE_LIBJEMALLOC #if defined(FOLLY_HAVE_LIBJEMALLOC) && !defined(FOLLY_SANITIZE)
#include <jemalloc/jemalloc.h> #include <jemalloc/jemalloc.h>
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment