Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c6d690b authored by Yi Kong's avatar Yi Kong Committed by android-build-merger
Browse files

Merge "Ignore expansion-to-defined warning from dlmalloc include" am: a54a6608 am: bb3a285b 

am: 3d850813

Change-Id: I94f4d33626afc46992cf087a918769c243a052e8
parents 898ac5d5 3d850813

libpixelflinger/codeflinger/CodeCache.cpp

+3 −0
Original line number Diff line number Diff line
@@ -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",