Merge "Ignore expansion-to-defined warning from dlmalloc include"

This commit is contained in:
Yi Kong 2018-12-12 02:27:48 +00:00 committed by Gerrit Code Review
commit a54a660892

View file

@ -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",