Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04b5ac36 authored by Ian Rogers's avatar Ian Rogers
Browse files

Remove unnecessary compiler pragma. 

With dlmalloc 2.8.6 the compiler pragmas to suppress warnings are not
necessary.
Also fix compiler warning about redefinition of LOG_TAG.

Depends upon: https://android-review.googlesource.com/42351

Change-Id: I50f70be31f4bd994b09083e722759464476c70b3
parent af03b050

libpixelflinger/codeflinger/CodeCache.cpp

+3 −8
Original line number Diff line number Diff line
@@ -22,13 +22,13 @@ 
#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"

#include "codeflinger/CodeCache.h"



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",