From 9e36739c1277d86adc7b82ef9a16f876a14b0683 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 24 Jun 2019 23:41:27 +0200 Subject: [PATCH] mimalloc: adjust for building inside Git MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We want to compile mimalloc's source code as part of Git, rather than requiring the code to be built as an external library: mimalloc uses a CMake-based build, which is not necessarily easy to integrate into the flavors of Git for Windows (which will be the main benefitting port). Signed-off-by: Johannes Schindelin Signed-off-by: Matthias Aßhauer --- compat/mimalloc/alloc.c | 1 - compat/mimalloc/mimalloc.h | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compat/mimalloc/alloc.c b/compat/mimalloc/alloc.c index cd711e73f5..c0ada97c90 100644 --- a/compat/mimalloc/alloc.c +++ b/compat/mimalloc/alloc.c @@ -17,7 +17,6 @@ terms of the MIT license. A copy of the license can be found in the file #include // malloc, abort #define MI_IN_ALLOC_C -#include "alloc-override.c" #include "free.c" #undef MI_IN_ALLOC_C diff --git a/compat/mimalloc/mimalloc.h b/compat/mimalloc/mimalloc.h index 174d9a34c9..6a926d1c80 100644 --- a/compat/mimalloc/mimalloc.h +++ b/compat/mimalloc/mimalloc.h @@ -95,7 +95,8 @@ terms of the MIT license. A copy of the license can be found in the file // Includes // ------------------------------------------------------ -#include // size_t +#include "compat/posix.h" + #include // bool #include // INTPTR_MAX