git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-05-31 21:40:27 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

mimalloc: adjust for building inside Git

Browse Source 
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>
This commit is contained in:
Johannes Schindelin
2019-06-24 23:41:27 +02:00
parent 461207c9e8
commit dfda515d0e
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
compat/mimalloc/alloc.c
View File

@@ -16,10 +16,6 @@ terms of the MIT license. A copy of the license can be found in the file
#include <string.h> // memset, strlen (for mi_strdup) #include <string.h> // memset, strlen (for mi_strdup)
#include <stdlib.h> // malloc, abort #include <stdlib.h> // malloc, abort
#define MI_IN_ALLOC_C
#include "alloc-override.c"
#undef MI_IN_ALLOC_C
// ------------------------------------------------------ // ------------------------------------------------------
// Allocation // Allocation
// ------------------------------------------------------ // ------------------------------------------------------

3
compat/mimalloc/mimalloc.h
View File

@@ -95,7 +95,8 @@ terms of the MIT license. A copy of the license can be found in the file
// Includes // Includes
// ------------------------------------------------------ // ------------------------------------------------------
#include <stddef.h> // size_t #include "git-compat-util.h"
#include <stdbool.h> // bool #include <stdbool.h> // bool
#include <stdint.h> // INTPTR_MAX #include <stdint.h> // INTPTR_MAX