mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 08:07:34 +00:00
Get rid of #ifdef SERENITY. We're past that phase of bootstrapping.
This commit is contained in:
parent
5605295d00
commit
b5c76d7559
14 changed files with 1 additions and 95 deletions
18
AK/kmalloc.h
18
AK/kmalloc.h
|
@ -11,7 +11,6 @@ private:
|
|||
#define AK_MAKE_ETERNAL
|
||||
#endif
|
||||
|
||||
#ifdef SERENITY
|
||||
#ifdef KERNEL
|
||||
#include <Kernel/kmalloc.h>
|
||||
#else
|
||||
|
@ -30,20 +29,3 @@ void* kmalloc_eternal(size_t) MALLOC_ATTR;
|
|||
inline void* operator new(size_t, void* p) { return p; }
|
||||
inline void* operator new[](size_t, void* p) { return p; }
|
||||
#endif
|
||||
#else
|
||||
#include <new>
|
||||
|
||||
#include "Types.h"
|
||||
|
||||
extern "C" {
|
||||
|
||||
void* kcalloc(size_t nmemb, size_t size);
|
||||
void* kmalloc(size_t size) MALLOC_ATTR;
|
||||
void kfree(void* ptr);
|
||||
void* krealloc(void* ptr, size_t size);
|
||||
void* kmalloc_eternal(size_t) MALLOC_ATTR;
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue