diff --git a/AK/kmalloc.h b/AK/kmalloc.h index d6a5966e3d..d5bf402c76 100644 --- a/AK/kmalloc.h +++ b/AK/kmalloc.h @@ -1,9 +1,5 @@ #pragma once -#ifndef KERNEL -#include -#endif - #if defined(SERENITY) && defined(KERNEL) #define AK_MAKE_ETERNAL \ public: \ @@ -48,4 +44,9 @@ inline void operator delete[](void* ptr) return kfree(ptr); } +inline void* operator new(size_t, void* ptr) +{ + return ptr; +} + #endif diff --git a/LibC/Makefile b/LibC/Makefile index 6910d70cab..dd2d7c839d 100644 --- a/LibC/Makefile +++ b/LibC/Makefile @@ -65,7 +65,7 @@ AS = i686-pc-serenity-as all: $(LIBRARY) startfiles startfiles: - @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o crt0.o -c crt0.cpp + @echo "CXX crt0.o"; $(CXX) $(CXXFLAGS) -o crt0.o -c crt0.cpp cp crti.ao crti.o cp crtn.ao crtn.o