| Ian Rogers | 30fab40 | 2012-01-23 15:43:46 -0800 | [diff] [blame] | 1 | // Copyright 2012 Google Inc. All Rights Reserved. |
| 2 | #define FOR_DLMALLOC_C // Avoid inclusion of src/malloc.h |
| 3 | #include "dlmalloc.h" |
| Carl Shapiro | 69759ea | 2011-07-21 18:13:35 -0700 | [diff] [blame] | 4 | |
| Ian Rogers | 30fab40 | 2012-01-23 15:43:46 -0800 | [diff] [blame] | 5 | #include <stddef.h> |
| 6 | #include <stdint.h> |
| 7 | #include <stdlib.h> |
| Carl Shapiro | 69759ea | 2011-07-21 18:13:35 -0700 | [diff] [blame] | 8 | |
| Ian Rogers | 30fab40 | 2012-01-23 15:43:46 -0800 | [diff] [blame] | 9 | // Disable GCC diagnostics so that -Werror won't fail |
| Ian Rogers | 30fab40 | 2012-01-23 15:43:46 -0800 | [diff] [blame] | 10 | #pragma GCC diagnostic ignored "-Wunused-variable" |
| 11 | #pragma GCC diagnostic ignored "-Wempty-body" |
| Carl Shapiro | 69759ea | 2011-07-21 18:13:35 -0700 | [diff] [blame] | 12 | |
| Ian Rogers | 30fab40 | 2012-01-23 15:43:46 -0800 | [diff] [blame] | 13 | // ART specific morecore implementation |
| 14 | #define MORECORE(x) art_heap_morecore(m, x) |
| 15 | extern void* art_heap_morecore(void* m, intptr_t increment); |
| Carl Shapiro | 69759ea | 2011-07-21 18:13:35 -0700 | [diff] [blame] | 16 | |
| Ian Rogers | 30fab40 | 2012-01-23 15:43:46 -0800 | [diff] [blame] | 17 | // Ugly inclusion of C file so that ART specific #defines configure dlmalloc |
| 18 | #include "dlmalloc/malloc.c" |