commit aa5ba91402f60e6beba38d45903a71366ad3c9c1
author Ian Rogers <irogers@google.com> Wed Sep 05 07:52:13 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 05 07:52:13 2012 -0700
tree e790248ada490ae14473aa230fafc37736afe3c4
parent 2004e4eb058ca637f44501f738258b27a93b3f5b
parent e599c4684ac47fe6417b9c482b7ff651513988ff

am e599c468: am cfeacbdd: Merge "Remove unnecessary compiler pragma."

* commit 'e599c4684ac47fe6417b9c482b7ff651513988ff':
  Remove unnecessary compiler pragma.

vm/alloc/DlMalloc.cpp

diff --git a/vm/alloc/DlMalloc.cpp b/vm/alloc/DlMalloc.cpp
index 8638ab5..1571801 100644
--- a/vm/alloc/DlMalloc.cpp
+++ b/vm/alloc/DlMalloc.cpp
@@ -36,11 +36,7 @@
  * dlmalloc for our use for mspaces (regular dlmalloc is still declared
  * in bionic).
  */
-#pragma GCC diagnostic ignored "-Wempty-body"
-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
 #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) {

vm/alloc/DlMalloc.h

diff --git a/vm/alloc/DlMalloc.h b/vm/alloc/DlMalloc.h
index e28c7e5..f076656 100644
--- a/vm/alloc/DlMalloc.h
+++ b/vm/alloc/DlMalloc.h
@@ -24,7 +24,6 @@
 #define MSPACES 1
 #define NO_MALLINFO 1
 #define ONLY_MSPACES 1
-#define USE_DL_PREFIX 1
 #define MALLOC_INSPECT_ALL 1
 
 /* Include the proper definitions. */