diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-28 20:03:24 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-28 20:03:24 -0400 |
commit | 975e28c01e70c63587c8633ffc3c50b7d1759dec (patch) | |
tree | 361d94f24acc207803afb8bff6ed7887dbbf391e /src/malloc.c | |
parent | d160ca467920d97245c012b8dd0cb8be6d06620a (diff) | |
parent | 5ea2f463d71d0bc2663e70a553557de0ccf40eef (diff) |
Merge branch 'master' into easy_chat
Diffstat (limited to 'src/malloc.c')
-rw-r--r-- | src/malloc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/malloc.c b/src/malloc.c index ccb2f7d20..1d64351c3 100644 --- a/src/malloc.c +++ b/src/malloc.c @@ -2,6 +2,7 @@ static void *sHeapStart; static u32 sHeapSize; +static u32 malloc_c_unused_0300000c; // needed to align dma3_manager.o(.bss) #define MALLOC_SYSTEM_ID 0xA3A3 |