diff options
author | Andreas Kling <awesomekling@gmail.com> | 2019-04-20 12:58:02 +0200 |
---|---|---|
committer | Andreas Kling <awesomekling@gmail.com> | 2019-04-20 12:58:49 +0200 |
commit | 301a269ca0361ba5fa94ad143d9f35049076f618 (patch) | |
tree | 9a1b4b1b20c5b71cbee5b45d6220e5b5eeb7e0b4 /AK/kmalloc.cpp | |
parent | 6aead8998ac1a0858265385dd0b6300973c1e99d (diff) | |
download | serenity-301a269ca0361ba5fa94ad143d9f35049076f618.zip |
Get rid of SERENITY macro since the compiler already defines __serenity__
This makes it a bit easier to use AK templates out-of-tree.
Diffstat (limited to 'AK/kmalloc.cpp')
-rw-r--r-- | AK/kmalloc.cpp | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/AK/kmalloc.cpp b/AK/kmalloc.cpp index f51bfd2910..13ad812270 100644 --- a/AK/kmalloc.cpp +++ b/AK/kmalloc.cpp @@ -1,34 +1,11 @@ #include "kmalloc.h" -#ifndef SERENITY +#ifndef __serenity__ #include <cstdlib> #endif extern "C" { -void* kcalloc(size_t nmemb, size_t size) -{ - return calloc(nmemb, size); -} - -void* kmalloc(size_t size) -{ - return malloc(size); -} - -void kfree(void* ptr) -{ - free(ptr); -} - -void* krealloc(void* ptr, size_t size) -{ - return realloc(ptr, size); -} -void* kmalloc_eternal(size_t size) -{ - return kmalloc(size); -} } |