Merge remote-tracking branch 'upstream' into tustin2121-patch-5

1 files changed, 0 insertions, 22 deletions

diff --git a/include/alloc.h b/include/alloc.h
deleted file mode 100644
index f2dcf6d46..000000000
--- a/include/alloc.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef GUARD_ALLOC_H
-#define GUARD_ALLOC_H
-
-#define HEAP_SIZE 0x1C000
-#define malloc Alloc
-#define calloc(ct, sz) AllocZeroed((ct) * (sz))
-#define free Free
-
-#define FREE_AND_SET_NULL(ptr)          \
-{                                       \
-    free(ptr);                          \
-    ptr = NULL;                         \
-}
-
-extern u8 gHeap[];
-
-void *Alloc(u32 size);
-void *AllocZeroed(u32 size);
-void Free(void *pointer);
-void InitHeap(void *pointer, u32 size);
-
-#endif // GUARD_ALLOC_H