From 6ad2d300fb850d799db9050d96f9de9dc7ec0d3b Mon Sep 17 00:00:00 2001 From: Ronald Caesar Date: Wed, 9 Jul 2025 17:56:39 -0400 Subject: [PATCH 1/3] fix(memory): remove the inclusion of mman.h on windows. Signed-off-by: Ronald Caesar --- core/memory/arena.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/memory/arena.cpp b/core/memory/arena.cpp index 1f5eeda..8eca6eb 100644 --- a/core/memory/arena.cpp +++ b/core/memory/arena.cpp @@ -1,6 +1,8 @@ #include "arena.h" -#include #include "Base/Assert.h" +#ifndef WIN32 +#include +#endif Memory::Arena Memory::arena_init() { // TODO(GloriousEggroll): Replace malloc with a windows memory mapping API. From 7897d0e2a28ca6e72d91af586030a696e95cec27 Mon Sep 17 00:00:00 2001 From: Ronald Caesar Date: Wed, 9 Jul 2025 17:56:39 -0400 Subject: [PATCH 2/3] fix(memory): remove the inclusion of mman.h on windows. Signed-off-by: Ronald Caesar --- core/memory/arena.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/memory/arena.cpp b/core/memory/arena.cpp index 8eca6eb..10af440 100644 --- a/core/memory/arena.cpp +++ b/core/memory/arena.cpp @@ -7,7 +7,8 @@ Memory::Arena Memory::arena_init() { // TODO(GloriousEggroll): Replace malloc with a windows memory mapping API. #ifdef WIN32 - static_cast(malloc(sizeof(uint8_t) * MEMORY_CAPACITY)); + auto data = + static_cast(malloc(sizeof(uint8_t) * MEMORY_CAPACITY)); #else void* data = mmap(nullptr, MEMORY_CAPACITY, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); From b603b978ea186d3d8885f7442795c010750e7a1c Mon Sep 17 00:00:00 2001 From: Ronald Caesar Date: Wed, 9 Jul 2025 18:17:40 -0400 Subject: [PATCH 3/3] fix(memory): remove MAP_FAILED from windows builds Signed-off-by: Ronald Caesar --- core/memory/arena.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/memory/arena.cpp b/core/memory/arena.cpp index 10af440..cdc8757 100644 --- a/core/memory/arena.cpp +++ b/core/memory/arena.cpp @@ -12,10 +12,10 @@ Memory::Arena Memory::arena_init() { #else void* data = mmap(nullptr, MEMORY_CAPACITY, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); -#endif if (data == MAP_FAILED) { return {0, 0, nullptr}; // Return invalid arena on failure } +#endif Memory::Arena arena = { .capacity = MEMORY_CAPACITY, .size = 0,