Merge branch 'master' into sub_81700F8

2017-09-19 21:00:24 -04:00
parent abe72dca47 f94074b602
commit 5fc2c964fb
79 changed files with 14775 additions and 32811 deletions
@@ -1,8 +1,11 @@
 #ifndef GUARD_MALLOC_H
 #define GUARD_MALLOC_H

-extern u8 gHeap[];
+#define malloc Alloc
+#define calloc AllocZeroed
+#define free Free

+extern u8 gHeap[];
 void *Alloc(u32 size);
 void *AllocZeroed(u32 size);
 void Free(void *pointer);