From a181a8f6e79124a878f3427f62828f296b2f4b10 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Wed, 10 Oct 2018 15:11:43 +0200 Subject: [PATCH] Run without SimpleMalloc locally for now. --- AK/.gitignore | 1 + AK/Vector.h | 1 + AK/kmalloc.cpp | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/AK/.gitignore b/AK/.gitignore index 516ac8b015..e9b985837a 100644 --- a/AK/.gitignore +++ b/AK/.gitignore @@ -1 +1,2 @@ akit-test +*.o diff --git a/AK/Vector.h b/AK/Vector.h index 2b57c99396..14c5e7f507 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 c9fe5a046e..deeacc7a67 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 +