projects / folly.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 162ba31) | patch
Don't define MALLOCX_* if building with JEMalloc
authorChristopher Dykes <cdykes@fb.com>
Wed, 8 Mar 2017 18:48:01 +0000 (10:48 -0800)
committerFacebook Github Bot <facebook-github-bot@users.noreply.github.com>
Wed, 8 Mar 2017 18:50:11 +0000 (10:50 -0800)
commit05d0e3eda9f6ce6950a9a5cc2afe8bff92e19e2e
tree65847255dbfce2fd70b520e22496f3e716ecaef0tree | snapshot
parent162ba31064ad2093e1fcb11ef4e02ab2a62eacb6commit | diff
Don't define MALLOCX_* if building with JEMalloc

Summary:
With the way it is currently, if `jemalloc.h` is included after `folly/Malloc.h`, `jemalloc.h` ends up redefining these.
This changes it to just include `jemalloc.h` if we know we're compiling with JEMalloc.

Reviewed By: yfeldblum

Differential Revision: D4660285

fbshipit-source-id: 814e36432676e89cf7ba2bc5247b7dde2bfdc14a
folly/Malloc.h diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.