Skip to content

Commit

Permalink
mimalloc: adjust for building inside Git
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
dscho committed Sep 18, 2024
1 parent e7da041 commit 7940371
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
4 changes: 0 additions & 4 deletions compat/mimalloc/alloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 <stdlib.h> // malloc, abort

#define MI_IN_ALLOC_C
#include "alloc-override.c"
#undef MI_IN_ALLOC_C

// ------------------------------------------------------
// Allocation
// ------------------------------------------------------
Expand Down
3 changes: 2 additions & 1 deletion compat/mimalloc/mimalloc.h
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ terms of the MIT license. A copy of the license can be found in the file
// Includes
// ------------------------------------------------------

#include <stddef.h> // size_t
#include "git-compat-util.h"

#include <stdbool.h> // bool
#include <stdint.h> // INTPTR_MAX

Expand Down

0 comments on commit 7940371

Please sign in to comment.