From 9e0588064fcd80f80aeb12f65bc2fef623063a86 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 25 Mar 2025 11:38:54 +0100 Subject: [PATCH] Temporarily revert "mimalloc: adjust for building inside Git" In preparation for upgrading to a newer mimalloc version. Signed-off-by: Johannes Schindelin --- compat/mimalloc/alloc.c | 4 ++++ compat/mimalloc/mimalloc.h | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/compat/mimalloc/alloc.c b/compat/mimalloc/alloc.c index ae272c1fb5..961f6d53d0 100644 --- a/compat/mimalloc/alloc.c +++ b/compat/mimalloc/alloc.c @@ -16,6 +16,10 @@ terms of the MIT license. A copy of the license can be found in the file #include // memset, strlen (for mi_strdup) #include // malloc, abort +#define MI_IN_ALLOC_C +#include "alloc-override.c" +#undef MI_IN_ALLOC_C + // ------------------------------------------------------ // Allocation // ------------------------------------------------------ diff --git a/compat/mimalloc/mimalloc.h b/compat/mimalloc/mimalloc.h index 7e3b5dd66e..c0f5e96e51 100644 --- a/compat/mimalloc/mimalloc.h +++ b/compat/mimalloc/mimalloc.h @@ -95,8 +95,7 @@ terms of the MIT license. A copy of the license can be found in the file // Includes // ------------------------------------------------------ -#include "git-compat-util.h" - +#include // size_t #include // bool #include // INTPTR_MAX