diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-20 13:12:43 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-20 13:12:43 +0200 |
| commit | 3919b7130b2a8709562b012099947923a16af02d (patch) | |
| tree | fc41f69f7213aaaed914d4ceebfa58d3beb519c6 /include/malloc.h | |
| parent | 67a8ac72ec8629d2d737fcd976969303bcd056f5 (diff) | |
| parent | f94074b6027d1efe067fd972127eb7730cbef2e0 (diff) | |
Fix merge conflicts
Diffstat (limited to 'include/malloc.h')
| -rw-r--r-- | include/malloc.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/malloc.h b/include/malloc.h index bd870ede3..b3216b05c 100644 --- a/include/malloc.h +++ b/include/malloc.h @@ -1,6 +1,10 @@ #ifndef GUARD_MALLOC_H #define GUARD_MALLOC_H +#define malloc Alloc +#define calloc AllocZeroed +#define free Free + void *Alloc(u32 size); void *AllocZeroed(u32 size); void Free(void *pointer); |