Skip to content

Commit 2fbfd31

Browse files
committed
mimalloc: adjust for building inside Git
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 <[email protected]>
1 parent 4460475 commit 2fbfd31

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

compat/mimalloc/alloc.c

-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ terms of the MIT license. A copy of the license can be found in the file
1515
#include <string.h> // memset, strlen
1616
#include <stdlib.h> // malloc, exit
1717

18-
#define MI_IN_ALLOC_C
19-
#include "alloc-override.c"
20-
#undef MI_IN_ALLOC_C
21-
2218
// ------------------------------------------------------
2319
// Allocation
2420
// ------------------------------------------------------

compat/mimalloc/mimalloc.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@ terms of the MIT license. A copy of the license can be found in the file
9393
// Includes
9494
// ------------------------------------------------------
9595

96-
#include <stddef.h> // size_t
96+
#include "git-compat-util.h"
97+
9798
#include <stdbool.h> // bool
9899

99100
#ifdef __cplusplus

0 commit comments

Comments
 (0)