Merge "Ignore null-pointer-arithmetic warning from dlmalloc include" am: 25a83f0176 am: 78f6832bd1
am: 1618aef64f

Change-Id: Ic678639dea3292dc380b39f6391c38c2339975ca
diff --git a/libpixelflinger/codeflinger/CodeCache.cpp b/libpixelflinger/codeflinger/CodeCache.cpp
index 5ed668c..32691a3 100644
--- a/libpixelflinger/codeflinger/CodeCache.cpp
+++ b/libpixelflinger/codeflinger/CodeCache.cpp
@@ -63,6 +63,7 @@
 
 #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