projects
/
folly.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
USE_JEMALLOC in the OSS build if we have jemalloc
[folly.git]
/
folly
/
portability
/
Malloc.cpp
diff --git
a/folly/portability/Malloc.cpp
b/folly/portability/Malloc.cpp
index 9baecb38e226fddbac7227fe3fbf4bd7ef0f71e2..d9bdf989ae37519a4da64476e58be4fabf3a1892 100755
(executable)
--- a/
folly/portability/Malloc.cpp
+++ b/
folly/portability/Malloc.cpp
@@
-16,7
+16,7
@@
#include <folly/portability/Malloc.h>
-#if
ndef USE_JEMALLOC
+#if
!defined(USE_JEMALLOC) && !defined(FOLLY_USE_JEMALLOC)
#if defined(__APPLE__) && !defined(FOLLY_HAVE_MALLOC_USABLE_SIZE)
#include <malloc/malloc.h>