diff options
| author | Ian Rogers <irogers@google.com> | 2012-08-29 14:07:21 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2012-08-29 14:07:21 -0700 |
| commit | aee874277d611c7535b559b009e9ec2d8d7025d3 (patch) | |
| tree | 361cfb1ac25b14afb1cb52c1234c9f8b3abb4a72 /vm/alloc/DlMalloc.cpp | |
| parent | a57317952de3fc37876f97e8655cc773b97df891 (diff) | |
| download | android_dalvik-aee874277d611c7535b559b009e9ec2d8d7025d3.tar.gz android_dalvik-aee874277d611c7535b559b009e9ec2d8d7025d3.tar.bz2 android_dalvik-aee874277d611c7535b559b009e9ec2d8d7025d3.zip | |
Remove unnecessary compiler pragma.
With dlmalloc 2.8.6 the compiler pragmas to suppress warnings are not
necessary.
Remove unnecessary dlmalloc dl prefix #define.
Depends upon: https://android-review.googlesource.com/42351
Change-Id: Idc45cee9342efec0aab63d5172b3308a0fca3c4f
Diffstat (limited to 'vm/alloc/DlMalloc.cpp')
| -rw-r--r-- | vm/alloc/DlMalloc.cpp | 4 |
1 files changed, 0 insertions, 4 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) { |