am d2d63740: am 21cdd22f: Merge "Include <malloc.h> for struct mallinfo."

* commit 'd2d63740b78459a414e293efdb16e7a9ac089d5c':
  Include <malloc.h> for struct mallinfo.
This commit is contained in:
Elliott Hughes 2015-01-31 07:49:25 +00:00 committed by Android Git Automerger
commit 9b96dd6b17

View File

@ -18,6 +18,7 @@
#define LIBC_BIONIC_JEMALLOC_H_
#include <jemalloc/jemalloc.h>
#include <malloc.h> // For struct mallinfo.
// Need to wrap memalign since je_memalign fails on non-power of 2 alignments.
#define je_memalign je_memalign_round_up_boundary