From baa4641a445669621c441e808e293373a09a7d00 Mon Sep 17 00:00:00 2001 From: dzaima Date: Sun, 12 Jun 2022 22:29:35 +0300 Subject: [PATCH] don't needlessly include sys/mman.h --- src/core.h | 2 ++ src/opt/mm_2buddy.c | 2 ++ src/opt/mm_2buddy.h | 1 - src/opt/mm_buddy.c | 2 ++ src/opt/mm_malloc.h | 1 - src/vm.h | 3 ++- 6 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/core.h b/src/core.h index e15a0307..9ab71e9d 100644 --- a/src/core.h +++ b/src/core.h @@ -6,6 +6,8 @@ #if MM==0 #include "opt/mm_malloc.h" + #undef ENABLE_GC + #define ENABLE_GC 0 #elif MM==1 #include "opt/mm_buddy.h" #elif MM==2 diff --git a/src/opt/mm_2buddy.c b/src/opt/mm_2buddy.c index 6e875ede..9863a359 100644 --- a/src/opt/mm_2buddy.c +++ b/src/opt/mm_2buddy.c @@ -1,4 +1,6 @@ +#if !NO_MMAP #include +#endif #include "gc.c" #ifdef OBJ_COUNTER diff --git a/src/opt/mm_2buddy.h b/src/opt/mm_2buddy.h index 37bdfdd8..51264de3 100644 --- a/src/opt/mm_2buddy.h +++ b/src/opt/mm_2buddy.h @@ -1,5 +1,4 @@ #include "gc.h" -#include typedef struct EmptyValue EmptyValue; struct EmptyValue { // needs set: mmInfo; type=t_empty; next; everything else can be garbage diff --git a/src/opt/mm_buddy.c b/src/opt/mm_buddy.c index 701f9ff3..9d1f68a5 100644 --- a/src/opt/mm_buddy.c +++ b/src/opt/mm_buddy.c @@ -1,4 +1,6 @@ +#if !NO_MMAP #include +#endif #include "gc.c" #ifdef OBJ_COUNTER diff --git a/src/opt/mm_malloc.h b/src/opt/mm_malloc.h index a7e7322b..707d5bd0 100644 --- a/src/opt/mm_malloc.h +++ b/src/opt/mm_malloc.h @@ -1,4 +1,3 @@ -#include #include #include extern u64 mm_heapAlloc; diff --git a/src/vm.h b/src/vm.h index b09a4de3..e060ba0e 100644 --- a/src/vm.h +++ b/src/vm.h @@ -1,6 +1,7 @@ #pragma once +#if !NO_MMAP #include - +#endif #if (defined(__x86_64) || defined(__amd64__)) && (__APPLE__ || __MACH__ || __linux__ || __FreeBSD__ || __unix || __unix__) && defined(MAP_32BIT) && MM!=0 #ifndef JIT_START