Commit a368d112 authored by Paul Jakma's avatar Paul Jakma Committed by Facebook Github Bot

Fix build

Summary: FOLLY_HAVE_LIBJEMALLOC does not get defined, breaking builds in certain configurations (e.g., jemalloc present, Fedora 28 with cmake). FOLLY_USE_JEMALLOC does. Substitute former with latter,

Differential Revision: D10349332

fbshipit-source-id: e30245f8f19c6b2b7861cd88a4e1719a15c10fce
parent 49f40690
...@@ -21,8 +21,7 @@ ...@@ -21,8 +21,7 @@
#include <sstream> #include <sstream>
#if defined(MADV_HUGEPAGE) && defined(FOLLY_HAVE_LIBJEMALLOC) && !FOLLY_SANITIZE #if defined(MADV_HUGEPAGE) && defined(FOLLY_USE_JEMALLOC) && !FOLLY_SANITIZE
#include <jemalloc/jemalloc.h> #include <jemalloc/jemalloc.h>
#if (JEMALLOC_VERSION_MAJOR >= 5) #if (JEMALLOC_VERSION_MAJOR >= 5)
#define FOLLY_JEMALLOC_HUGE_PAGE_ALLOCATOR_SUPPORTED 1 #define FOLLY_JEMALLOC_HUGE_PAGE_ALLOCATOR_SUPPORTED 1
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include <folly/CPortability.h> #include <folly/CPortability.h>
#include <folly/portability/Config.h> #include <folly/portability/Config.h>
#if defined(FOLLY_HAVE_LIBJEMALLOC) && !FOLLY_SANITIZE #if defined(FOLLY_USE_JEMALLOC) && !FOLLY_SANITIZE
#include <folly/portability/SysMman.h> #include <folly/portability/SysMman.h>
#include <jemalloc/jemalloc.h> #include <jemalloc/jemalloc.h>
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#endif #endif
#endif #endif
#endif // FOLLY_HAVE_LIBJEMALLOC #endif // FOLLY_USE_JEMALLOC
#include <cstddef> #include <cstddef>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include <folly/memory/Malloc.h> #include <folly/memory/Malloc.h>
#include <folly/portability/GTest.h> #include <folly/portability/GTest.h>
#if defined(FOLLY_HAVE_LIBJEMALLOC) && !FOLLY_SANITIZE #if defined(FOLLY_USE_JEMALLOC) && !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