Skip to content

Commit 3d296b0

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 <johannes.schindelin@gmx.de>
1 parent bf284f1 commit 3d296b0

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
@@ -16,10 +16,6 @@ terms of the MIT license. A copy of the license can be found in the file
1616
#include <string.h> // memset, strlen (for mi_strdup)
1717
#include <stdlib.h> // malloc, abort
1818

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

compat/mimalloc/mimalloc.h

+2-1
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)