commit 43cc8f0d758db8082b4db464bc22ebcb884ab89c
author Yi Kong <yikong@google.com> Wed Dec 12 02:27:48 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 12 02:27:48 2018 +0000
tree b6b6b9160205a8ebd074b263f3d0fb519be40827
parent 4def3a402bb3ba4ec8bd5b6c88d387dcddc8c9ca
parent 84acd153085d2c5d53f549b399aac25bfa9ba000

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

libpixelflinger/codeflinger/CodeCache.cpp

diff --git a/libpixelflinger/codeflinger/CodeCache.cpp b/libpixelflinger/codeflinger/CodeCache.cpp
index 8516640..5ed668c 100644
--- a/libpixelflinger/codeflinger/CodeCache.cpp
+++ b/libpixelflinger/codeflinger/CodeCache.cpp
@@ -61,7 +61,10 @@
 #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",