Ladybird/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-06-09 09:34:57 +09:00
Code Activity

Get rid of SERENITY macro since the compiler already defines __serenity__

Browse source 
This makes it a bit easier to use AK templates out-of-tree.
This commit is contained in:
Andreas Kling 2019-04-20 12:58:02 +02:00
parent 6aead8998a
commit 301a269ca0
Notes: sideshowbarker 2024-07-19 14:38:51 +09:00
27 changed files with 39 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

18
AK/kmalloc.h
View file

@ -1,6 +1,6 @@
#pragma once
#if defined(SERENITY) && defined(KERNEL)
#ifdef KERNEL
#define AK_MAKE_ETERNAL \
public: \
void* operator new(size_t size) { return kmalloc_eternal(size); } \
@ -12,17 +12,14 @@ private:
#ifdef KERNEL
#include <Kernel/kmalloc.h>
#else
#include <LibC/stdlib.h>
#include <stdlib.h>
extern "C" {
[[gnu::malloc, gnu::returns_nonnull]] void* kmalloc(size_t size);
[[gnu::malloc, gnu::returns_nonnull]] void* kmalloc_eternal(size_t);
[[gnu::returns_nonnull]] void* krealloc(void* ptr, size_t size);
void kfree(void* ptr);
}
#define kcalloc calloc
#define kmalloc malloc
#define kfree free
#define krealloc realloc
#ifdef __serenity__
inline void* operator new(size_t size)
{
return kmalloc(size);
@ -47,5 +44,6 @@ inline void* operator new(size_t, void* ptr)
{
return ptr;
}
#endif
#endif