openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am 0991797f: am 82959f5e: Merge "Remove unnecessary compiler pragma." 

* commit '0991797fd6cabc582afb0a35a62ad0cdc9cd6837':
  Remove unnecessary compiler pragma.
This commit is contained in:
Ian Rogers 2012-09-07 20:00:29 -07:00 committed by Android Git Automerger
parent 7908a68e70 0991797fd6
commit 6de267876b
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libpixelflinger/codeflinger/CodeCache.cpp
View File

@ -22,14 +22,14 @@
#include <unistd.h>
#include <sys/mman.h>
#include <cutils/log.h>
#include <cutils/ashmem.h>
#include <cutils/atomic.h>
#define LOG_TAG "CodeCache"
#include <cutils/log.h>
#include "codeflinger/CodeCache.h"
#define LOG_TAG "CodeCache"
namespace android {
// ----------------------------------------------------------------------------
@ -63,12 +63,7 @@ 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 ignored "-Wstrict-aliasing"
#pragma GCC diagnostic ignored "-Wempty-body"
#include "../../../../bionic/libc/upstream-dlmalloc/malloc.c"
#pragma GCC diagnostic warning "-Wstrict-aliasing"
#pragma GCC diagnostic warning "-Wempty-body"
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",