commit b796459f7dd0759354b5a7bba55b0320bfb559d0
author Treehugger Robot <treehugger-gerrit@google.com> Wed Dec 12 18:08:01 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 12 18:08:01 2018 +0000
tree a9a31382719ddd0e8c57a0685a11b0f599ea1f2f
parent 1c0bfc2165ab2706f1ef377ad4410d106aaa784b
parent 6af700888bd996cbb04b75b7e3eed187638259f3

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

libpixelflinger/codeflinger/CodeCache.cpp

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