diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-21 10:50:15 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-21 10:50:15 +0200 |
| commit | 9ee9a20152694f456841eb890b986d42f3c50e26 (patch) | |
| tree | 2998678c0f3db391b080318633bc506248542ecb /include/malloc.h | |
| parent | 3919b7130b2a8709562b012099947923a16af02d (diff) | |
| parent | ed9e0e20547e2c96833cddea67c6b423ef7af7ef (diff) | |
fix merge conflicts
Diffstat (limited to 'include/malloc.h')
| -rw-r--r-- | include/malloc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/malloc.h b/include/malloc.h index b3216b05c..4568e244a 100644 --- a/include/malloc.h +++ b/include/malloc.h @@ -5,8 +5,10 @@ #define calloc AllocZeroed #define free Free +extern u8 gHeap[]; void *Alloc(u32 size); void *AllocZeroed(u32 size); void Free(void *pointer); +void InitHeap(void *pointer, u32 size); #endif // GUARD_MALLOC_H |