Commit d849ddfd authored by Yedidya Feldblum's avatar Yedidya Feldblum Committed by Facebook Github Bot

Replace FOLLY_HAVE_MALLOC_H with __has_include

Summary:
[Folly] Replace `FOLLY_HAVE_MALLOC_H` with `__has_include`.

Now that folly only targets which support `__has_include`.

Reviewed By: Orvid

Differential Revision: D9281875

fbshipit-source-id: eb895f3e034e4a4d3c9eb34fb73d47893e59f5ef
parent ba837af1
...@@ -6,7 +6,6 @@ include(CheckSymbolExists) ...@@ -6,7 +6,6 @@ include(CheckSymbolExists)
include(CheckTypeSize) include(CheckTypeSize)
include(CheckCXXCompilerFlag) include(CheckCXXCompilerFlag)
CHECK_INCLUDE_FILE_CXX(malloc.h FOLLY_HAVE_MALLOC_H)
CHECK_INCLUDE_FILE_CXX(features.h FOLLY_HAVE_FEATURES_H) CHECK_INCLUDE_FILE_CXX(features.h FOLLY_HAVE_FEATURES_H)
CHECK_INCLUDE_FILE_CXX(jemalloc/jemalloc.h FOLLY_USE_JEMALLOC) CHECK_INCLUDE_FILE_CXX(jemalloc/jemalloc.h FOLLY_USE_JEMALLOC)
......
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#cmakedefine FOLLY_HAVE_LIBGLOG 1 #cmakedefine FOLLY_HAVE_LIBGLOG 1
#cmakedefine FOLLY_HAVE_MALLOC_H 1
#cmakedefine FOLLY_HAVE_FEATURES_H 1 #cmakedefine FOLLY_HAVE_FEATURES_H 1
#cmakedefine FOLLY_USE_JEMALLOC 1 #cmakedefine FOLLY_USE_JEMALLOC 1
......
...@@ -93,8 +93,6 @@ extern "C" int mallctlbymib(const size_t*, size_t, void*, size_t*, void*, ...@@ -93,8 +93,6 @@ extern "C" int mallctlbymib(const size_t*, size_t, void*, size_t*, void*,
size_t) size_t)
__attribute__((__weak__)); __attribute__((__weak__));
#define FOLLY_HAVE_MALLOC_H 1
#else // !defined(_LIBSTDCXX_FBSTRING) #else // !defined(_LIBSTDCXX_FBSTRING)
#include <folly/lang/Exception.h> /* nolint */ #include <folly/lang/Exception.h> /* nolint */
...@@ -105,7 +103,7 @@ __attribute__((__weak__)); ...@@ -105,7 +103,7 @@ __attribute__((__weak__));
// for malloc_usable_size // for malloc_usable_size
// NOTE: FreeBSD 9 doesn't have malloc.h. Its definitions // NOTE: FreeBSD 9 doesn't have malloc.h. Its definitions
// are found in stdlib.h. // are found in stdlib.h.
#if FOLLY_HAVE_MALLOC_H #if __has_include(<malloc.h>)
#include <malloc.h> #include <malloc.h>
#else #else
#include <stdlib.h> #include <stdlib.h>
......
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