Skip to content

Commit 9e05880

Browse files
committed
Temporarily revert "mimalloc: adjust for building inside Git"
In preparation for upgrading to a newer mimalloc version. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 9da41ca commit 9e05880

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

compat/mimalloc/alloc.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ 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+
1923
// ------------------------------------------------------
2024
// Allocation
2125
// ------------------------------------------------------

compat/mimalloc/mimalloc.h

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

98-
#include "git-compat-util.h"
99-
98+
#include <stddef.h> // size_t
10099
#include <stdbool.h> // bool
101100
#include <stdint.h> // INTPTR_MAX
102101

0 commit comments

Comments
 (0)