Skip to content

Commit 5906850

Browse files
dschoGit for Windows Build Agent
authored and
Git for Windows Build Agent
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 a4c254e commit 5906850

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

compat/mimalloc/alloc.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ terms of the MIT license. A copy of the license can be found in the file
1717
#include <stdlib.h> // malloc, abort
1818

1919
#define MI_IN_ALLOC_C
20-
#include "alloc-override.c"
2120
#include "free.c"
2221
#undef MI_IN_ALLOC_C
2322

compat/mimalloc/mimalloc.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@ terms of the MIT license. A copy of the license can be found in the file
9595
// Includes
9696
// ------------------------------------------------------
9797

98-
#include <stddef.h> // size_t
98+
#include "git-compat-util.h"
99+
99100
#include <stdbool.h> // bool
100101
#include <stdint.h> // INTPTR_MAX
101102

0 commit comments

Comments
 (0)