diff --git a/AK/.gitignore b/AK/.gitignore index 516ac8b0150..e9b985837af 100644 --- a/AK/.gitignore +++ b/AK/.gitignore @@ -1 +1,2 @@ akit-test +*.o diff --git a/AK/Vector.h b/AK/Vector.h index 2b57c993960..14c5e7f5076 100644 --- a/AK/Vector.h +++ b/AK/Vector.h @@ -2,6 +2,7 @@ #include "Assertions.h" #include "OwnPtr.h" +#include "kmalloc.h" #include #include #include diff --git a/AK/kmalloc.cpp b/AK/kmalloc.cpp index c9fe5a046e2..deeacc7a673 100644 --- a/AK/kmalloc.cpp +++ b/AK/kmalloc.cpp @@ -1,6 +1,37 @@ #include #include "SimpleMalloc.h" #include +#include + +#define USE_SYSTEM_MALLOC + +#ifdef USE_SYSTEM_MALLOC + +extern "C" { + +void* kcalloc(dword nmemb, dword size) +{ + return calloc(nmemb, size); +} + +void* kmalloc(dword size) +{ + return malloc(size); +} + +void kfree(void* ptr) +{ + free(ptr); +} + +void* krealloc(void* ptr, dword size) +{ + return realloc(ptr, size); +} + +} + +#else extern "C" { @@ -64,3 +95,5 @@ void operator delete[](void* ptr, size_t) return kfree(ptr); } +#endif +