Merge "Ignore expansion-to-defined warning from dlmalloc include" am: a54a660892 am: bb3a285bb5
am: 3d85081369
Change-Id: I94f4d33626afc46992cf087a918769c243a052e8
This commit is contained in:
commit
7c6d690bc9
1 changed files with 3 additions and 0 deletions
|
|
@ -61,7 +61,10 @@ static void heap_error(const char* msg, const char* function, void* p);
|
|||
#define USAGE_ERROR_ACTION(m,p) \
|
||||
heap_error("ARGUMENT IS INVALID HEAP ADDRESS", __FUNCTION__, p)
|
||||
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wexpansion-to-defined"
|
||||
#include "../../../../external/dlmalloc/malloc.c"
|
||||
#pragma GCC diagnostic pop
|
||||
|
||||
static void heap_error(const char* msg, const char* function, void* p) {
|
||||
ALOG(LOG_FATAL, LOG_TAG, "@@@ ABORTING: CODE FLINGER: %s IN %s addr=%p",
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue