From bded472ec4f2fc5d49deb4e55c734da93dcfa36c Mon Sep 17 00:00:00 2001
From: Andreas Kling <kling@serenityos.org>
Date: Wed, 20 May 2020 15:52:12 +0200
Subject: [PATCH] Revert "AK+LibC: Move non-placement new/delete into LibC"

This reverts commit 2c823473930121aecbacf0422c8372a0912e581b.
---
 AK/kmalloc.h              | 30 ++++++++++++++++++++++++++++++
 Libraries/LibC/malloc.cpp | 30 ------------------------------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/AK/kmalloc.h b/AK/kmalloc.h
index c5a7a13e26..6ef4caed0e 100644
--- a/AK/kmalloc.h
+++ b/AK/kmalloc.h
@@ -52,6 +52,36 @@
 
 #    ifdef __serenity__
 
+inline void* operator new(size_t size)
+{
+    return kmalloc(size);
+}
+
+inline void operator delete(void* ptr)
+{
+    return kfree(ptr);
+}
+
+inline void operator delete(void* ptr, size_t)
+{
+    return kfree(ptr);
+}
+
+inline void* operator new[](size_t size)
+{
+    return kmalloc(size);
+}
+
+inline void operator delete[](void* ptr)
+{
+    return kfree(ptr);
+}
+
+inline void operator delete[](void* ptr, size_t)
+{
+    return kfree(ptr);
+}
+
 inline void* operator new(size_t, void* ptr)
 {
     return ptr;
diff --git a/Libraries/LibC/malloc.cpp b/Libraries/LibC/malloc.cpp
index eb28a46d05..500788c89b 100644
--- a/Libraries/LibC/malloc.cpp
+++ b/Libraries/LibC/malloc.cpp
@@ -439,33 +439,3 @@ void __malloc_init()
     new (&big_allocators()[0])(BigAllocator);
 }
 }
-
-void* operator new(size_t size)
-{
-    return malloc(size);
-}
-
-void* operator new[](size_t size)
-{
-    return malloc(size);
-}
-
-void operator delete(void* ptr)
-{
-    return free(ptr);
-}
-
-void operator delete(void* ptr, size_t)
-{
-    return free(ptr);
-}
-
-void operator delete[](void* ptr)
-{
-    return free(ptr);
-}
-
-void operator delete[](void* ptr, size_t)
-{
-    return free(ptr);
-}