Some more OpenSSL 1.1.0 compat APIs

[folly.git] / folly / portability / Malloc.cpp

diff --git a/folly/portability/Malloc.cpp b/folly/portability/Malloc.cpp
index 402ee099dde8b6eb7dff68d325df6e2562742e5e..b41de5a2c5758bd809deb0658452693bd24927d2 100755 (executable)
--- a/folly/portability/Malloc.cpp
+++ b/folly/portability/Malloc.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Facebook, Inc.
+ * Copyright 2017 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 #include <folly/portability/Malloc.h>
 
+#if !defined(USE_JEMALLOC) && !defined(FOLLY_USE_JEMALLOC)
 #if defined(__APPLE__) && !defined(FOLLY_HAVE_MALLOC_USABLE_SIZE)
 #include <malloc/malloc.h>
 
@@ -27,3 +28,4 @@ extern "C" size_t malloc_usable_size(void* addr) {
   return _msize(addr);
 }
 #endif
+#endif