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 /include/malloc.h | |
parent | d160ca467920d97245c012b8dd0cb8be6d06620a (diff) | |
parent | 5ea2f463d71d0bc2663e70a553557de0ccf40eef (diff) |
Merge branch 'master' into easy_chat
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[]; |