Merge "Ignore null-pointer-arithmetic warning from dlmalloc include"

am: 25a83f0176

Change-Id: I28e8d63ea5df8f10d3a75c51a490c62d812b9c9a
This commit is contained in:
Yi Kong 2018-12-12 10:22:32 -08:00 committed by android-build-merger
commit 78f6832bd1

View file

@ -63,6 +63,7 @@ static void heap_error(const char* msg, const char* function, void* p);
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wexpansion-to-defined"
#pragma GCC diagnostic ignored "-Wnull-pointer-arithmetic"
#include "../../../../external/dlmalloc/malloc.c"
#pragma GCC diagnostic pop