From 301a269ca0361ba5fa94ad143d9f35049076f618 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sat, 20 Apr 2019 12:58:02 +0200 Subject: Get rid of SERENITY macro since the compiler already defines __serenity__ This makes it a bit easier to use AK templates out-of-tree. --- AK/kmalloc.cpp | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) (limited to 'AK/kmalloc.cpp') 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 #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); -} } -- cgit v1.2.3