os-k-team/os-k
os-k-team
/
os-k
2
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'BetterTerm' into BetterPaging

This commit is contained in:
Adrien Bourmault 2019-05-15 16:42:26 +02:00
parent 9152ac341f 602b436113
commit bee9793a8b
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kaleid/libc/mem.c
View File

@ -36,7 +36,11 @@ void *malloc(size_t n)
void *ptr; void *ptr;
error_t rc; error_t rc;
#ifndef _KALEID_KERNEL
rc = KalAllocMemory(&ptr, n); rc = KalAllocMemory(&ptr, n);
#else
rc = KalAllocMemoryEx(&ptr, n, M_ZEROED, 0);
#endif
if (rc > 0) seterrno(rc); if (rc > 0) seterrno(rc);
return ptr; return ptr;