Skip to content

Commit c054ae1

Browse files
dschoGit for Windows Build Agent
authored andcommitted
fixup! mimalloc: adjust for building inside Git
Part of the series that drops the vendored `mimalloc` from this fork; the rationale (no measurable speedup over the platform allocator on any of Windows, macOS, or Linux) is in the second commit of the series and the PR description. The `fixup!` subject is so the next rebase against an upstream Git that already lacks the target commit autosquashes this revert into it, dropping the original cleanly. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 parent 52a9199 commit c054ae1

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

compat/mimalloc/alloc.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ 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"
2021
#include "free.c"
2122
#undef MI_IN_ALLOC_C
2223

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 "compat/posix.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)