diff options
| author | Yi Kong <yikong@google.com> | 2018-12-10 04:58:11 -0800 |
|---|---|---|
| committer | Yi Kong <yikong@google.com> | 2018-12-10 19:18:22 +0000 |
| commit | 049cbaa3a00b9e215ebee70f1b64cda62910c695 (patch) | |
| tree | 82c65ca048a9955756a8249bfc3862de1c486949 /libpixelflinger | |
| parent | b81bc9ec007c22db0c3ac8039c050936ca20a028 (diff) | |
| download | system_core-049cbaa3a00b9e215ebee70f1b64cda62910c695.tar.gz system_core-049cbaa3a00b9e215ebee70f1b64cda62910c695.tar.bz2 system_core-049cbaa3a00b9e215ebee70f1b64cda62910c695.zip | |
Ignore expansion-to-defined warning from dlmalloc include
system/core/libpixelflinger/codeflinger/../../../../external/dlmalloc/malloc.c:588:22: note: expanded from macro 'USE_LOCKS'
#define USE_LOCKS ((defined(USE_SPIN_LOCKS) && USE_SPIN_LOCKS != 0) || \
^
system/core/libpixelflinger/codeflinger/../../../../external/dlmalloc/malloc.c:2742:5: error: macro expansion producing 'defined' has undefined behavior [-Werror,-Wexpansion-to-defined]
system/core/libpixelflinger/codeflinger/../../../../external/dlmalloc/malloc.c:589:22: note: expanded from macro 'USE_LOCKS'
(defined(USE_RECURSIVE_LOCKS) && USE_RECURSIVE_LOCKS != 0))
Test: m checkbuild
Bug: 29823425
Change-Id: I3acbcb9c9cab3713041fc130358f7ecdec70a589
Diffstat (limited to 'libpixelflinger')
| -rw-r--r-- | libpixelflinger/codeflinger/CodeCache.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libpixelflinger/codeflinger/CodeCache.cpp b/libpixelflinger/codeflinger/CodeCache.cpp index 851664070..5ed668c6f 100644 --- a/libpixelflinger/codeflinger/CodeCache.cpp +++ b/libpixelflinger/codeflinger/CodeCache.cpp @@ -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", |