diff options
| author | Ian Rogers <irogers@google.com> | 2012-09-05 07:41:00 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-09-05 07:41:00 -0700 |
| commit | cfeacbdd0cdd71a7974ac623e6534d0221d93ed9 (patch) | |
| tree | 446f56128ca65a8c23c5b4e6c1af1854d55b703c | |
| parent | e6516a5395a20f2bf923753e4dd87ffd304074fb (diff) | |
| parent | aee874277d611c7535b559b009e9ec2d8d7025d3 (diff) | |
| download | android_dalvik-cfeacbdd0cdd71a7974ac623e6534d0221d93ed9.tar.gz android_dalvik-cfeacbdd0cdd71a7974ac623e6534d0221d93ed9.tar.bz2 android_dalvik-cfeacbdd0cdd71a7974ac623e6534d0221d93ed9.zip | |
Merge "Remove unnecessary compiler pragma."
| -rw-r--r-- | vm/alloc/DlMalloc.cpp | 4 | ||||
| -rw-r--r-- | vm/alloc/DlMalloc.h | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/vm/alloc/DlMalloc.cpp b/vm/alloc/DlMalloc.cpp index 8638ab5fa..157180100 100644 --- a/vm/alloc/DlMalloc.cpp +++ b/vm/alloc/DlMalloc.cpp @@ -36,11 +36,7 @@ static void heap_error(const char* msg, const char* function, void* p); * 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) { diff --git a/vm/alloc/DlMalloc.h b/vm/alloc/DlMalloc.h index e28c7e513..f07665654 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. */ |