diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-04 11:18:50 +0200 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-04 11:18:50 +0200 |
commit | aaa191f0d85e4a6c82a037b471a67cddb4da2c06 (patch) | |
tree | 99464c84c8c6375d90c5c637e4dbda8ec888e6d5 /src/malloc.c | |
parent | 46fe1f441f1f40633b538c9db7d24aa4439629cf (diff) | |
parent | 09d5d81c9cd2295ec1a52323c7a8337313a3b021 (diff) |
Merge branch 'master' into decomp_battle2
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 |