diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2019-02-22 10:06:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-22 10:06:24 +0000 |
| commit | c5594852ac3344dc162b4e6f9773803a54bccb31 (patch) | |
| tree | 3ce338638281a2593975f2d75daceee83b827a3d /src/alloc.c | |
| parent | 3aa8401a8fd8dc919867a33a36c11db7d63cf223 (diff) | |
| parent | 765ff6e029a422d910ec65c38fd16ed90caff7b5 (diff) | |
| download | libgit2-c5594852ac3344dc162b4e6f9773803a54bccb31.tar.gz | |
Merge pull request #4998 from pks-t/pks/allocator-restructuring
Allocator restructuring
Diffstat (limited to 'src/alloc.c')
| -rw-r--r-- | src/alloc.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/alloc.c b/src/alloc.c index 8d4a19476..51c4d8029 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -7,11 +7,8 @@ #include "alloc.h" -#if defined(GIT_MSVC_CRTDBG) -# include "win32/w32_crtdbg_stacktrace.h" -#else -# include "stdalloc.h" -#endif +#include "allocators/stdalloc.h" +#include "allocators/win32_crtdbg.h" git_allocator git__allocator; @@ -44,12 +41,3 @@ int git_allocator_setup(git_allocator *allocator) memcpy(&git__allocator, allocator, sizeof(*allocator)); return 0; } - -#if !defined(GIT_MSVC_CRTDBG) -int git_win32_crtdbg_init_allocator(git_allocator *allocator) -{ - GIT_UNUSED(allocator); - git_error_set(GIT_EINVALID, "crtdbg memory allocator not available"); - return -1; -} -#endif |