diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-13 19:58:45 +0200 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-13 19:58:45 +0200 |
commit | 72ed86171500c58644655bac7d33c07749cbf299 (patch) | |
tree | 66ef93a15092fa5978fe4c1409605fc3236390ef /include/malloc.h | |
parent | 20d158cf4a17e8d362cdafbf13906c59d9916e24 (diff) | |
parent | 3040c1e1aa07a8a6466dd3653462595c2dd0fc9c (diff) |
fix rom3 conflicts
Diffstat (limited to 'include/malloc.h')
-rw-r--r-- | include/malloc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/malloc.h b/include/malloc.h index 4568e244a..f3a731797 100644 --- a/include/malloc.h +++ b/include/malloc.h @@ -2,7 +2,7 @@ #define GUARD_MALLOC_H #define malloc Alloc -#define calloc AllocZeroed +#define calloc(ct, sz) AllocZeroed((ct) * (sz)) #define free Free extern u8 gHeap[]; |